调整

复合检验管理/TradeManage.dpr

@@ -2,11 +2,11 @@ library TradeManage;
 uses
   SysUtils,
   classes,
-  forms,
+  forms,           
   WinTypes,
   WinProcs,
   U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule},
-  U_GetDllForm in 'U_GetDllForm.pas',                                                                   
+  U_GetDllForm in 'U_GetDllForm.pas',
   U_ZDYHelpSel in '..\..\..\ThreeFun\Form\U_ZDYHelpSel.pas' {frmZDYHelpSel},
   U_SelExportField in '..\..\..\ThreeFun\Fun\U_SelExportField.pas' {frmSelExportField},
   U_ColumnSet in '..\..\..\ThreeFun\Form\U_ColumnSet.pas' {frmColumnSet},
@@ -23,7 +23,7 @@ uses
   U_CpRkSaoMNewDB in 'U_CpRkSaoMNewDB.pas' {frmCpRkSaoMNewDB},
   U_OrderSelRK in 'U_OrderSelRK.pas' {frmOrderSelRK},
   U_CKProductBCPKCHZList in 'U_CKProductBCPKCHZList.pas' {frmCKProductBCPKCHZList},
-  U_ClothHCList in 'U_ClothHCList.pas' {frmClothHCList},
+  U_ClothHCList_WGH in 'U_ClothHCList_WGH.pas' {frmClothHCList_WGH},
   U_ContractListNX in 'U_ContractListNX.pas' {frmContractListNX},
   U_OrderJDList in 'U_OrderJDList.pas' {frmOrderJDList},
   U_ProductOrderListSel in 'U_ProductOrderListSel.pas' {frmProductOrderListSel},

复合检验管理/TradeManage.skincfg

@@ -1,7 +1,7 @@
 [ExpressSkins]
 Default=1
 ShowNotifications=1
-Enabled=0
+Enabled=1
 dxSkinBlack=1
 dxSkinBlue=1
 dxSkinBlueprint=1

复合检验管理/U_ClothHCList.dfm

@@ -348,6 +348,18 @@ object frmClothHCList: TfrmClothHCList
         HeaderAlignmentHorz = taCenter
         Width = 96
       end
+      object TV2Column1: TcxGridDBColumn
+        Caption = #32568#21495
+        DataBinding.FieldName = 'ganghao'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object TV2Column2: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'MPRTSCTeBieNote'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
       object V2Subid: TcxGridDBColumn
         Caption = #35746#21333#26465#30721
         DataBinding.FieldName = 'Subid'

复合检验管理/U_ClothHCList.pas

@@ -11,7 +11,20 @@ uses
   cxGridDBTableView, cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter,
   RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport,
   cxTextEdit, cxDropDownEdit, cxCheckBox, cxLookAndFeels,
-  cxLookAndFeelPainters, cxNavigator;
+  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle,
+  dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary,
+  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 type
   TfrmClothHCList = class(TForm)
@@ -62,6 +75,8 @@ type
     V2Column2: TcxGridDBColumn;
     PRTHX: TEdit;
     Label5: TLabel;
+    TV2Column1: TcxGridDBColumn;
+    TV2Column2: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);

复合检验管理/U_ClothHCList_WGH.dfm

@@ -0,0 +1,433 @@
+object frmClothHCList_WGH: TfrmClothHCList_WGH
+  Left = 377
+  Top = 240
+  Width = 1179
+  Height = 705
+  Caption = #26410#23436#25104#32568#21495#26597#35810
+  Color = clBtnFace
+  Font.Charset = GB2312_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -12
+  Font.Name = #23435#20307
+  Font.Style = []
+  OldCreateOrder = False
+  WindowState = wsMaximized
+  OnClose = FormClose
+  OnDestroy = FormDestroy
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar
+    Left = 0
+    Top = 0
+    Width = 1163
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 59
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Flat = True
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -12
+    Font.Name = #23435#20307
+    Font.Style = []
+    Images = DataLink_TradeManage.ThreeImgList
+    List = True
+    ParentColor = False
+    ParentFont = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 2
+      OnClick = TBRafreshClick
+    end
+    object TBFind: TToolButton
+      Left = 63
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 59
+      OnClick = TBFindClick
+    end
+    object TBClose: TToolButton
+      Left = 126
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 55
+      OnClick = TBCloseClick
+    end
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 32
+    Width = 1163
+    Height = 73
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clSkyBlue
+    TabOrder = 1
+    object Label1: TLabel
+      Left = 23
+      Top = 22
+      Width = 52
+      Height = 12
+      Caption = #21046#21333#26085#26399
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      Visible = False
+    end
+    object Label3: TLabel
+      Left = 190
+      Top = 23
+      Width = 40
+      Height = 12
+      Caption = #32568'  '#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label6: TLabel
+      Left = 361
+      Top = 24
+      Width = 54
+      Height = 12
+      Caption = #39068'    '#33394
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label9: TLabel
+      Left = 1016
+      Top = 22
+      Width = 53
+      Height = 12
+      Caption = #21512' '#21516' '#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      Visible = False
+    end
+    object Label2: TLabel
+      Left = 1016
+      Top = 46
+      Width = 52
+      Height = 12
+      Caption = #20135#21697#21517#31216
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      Visible = False
+    end
+    object Label10: TLabel
+      Left = 577
+      Top = 22
+      Width = 52
+      Height = 12
+      Caption = #22411#21495#35268#26684
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      Visible = False
+    end
+    object Label4: TLabel
+      Left = 190
+      Top = 46
+      Width = 40
+      Height = 12
+      Caption = #33394'  '#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label5: TLabel
+      Left = 749
+      Top = 22
+      Width = 52
+      Height = 12
+      Caption = #33457#22411#33457#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      Visible = False
+    end
+    object BegDate: TDateTimePicker
+      Left = 76
+      Top = 18
+      Width = 90
+      Height = 20
+      Date = 40675.464742650460000000
+      Format = 'yyyy-MM-dd'
+      Time = 40675.464742650460000000
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 0
+      Visible = False
+    end
+    object EndDate: TDateTimePicker
+      Left = 76
+      Top = 42
+      Width = 90
+      Height = 20
+      Date = 40675.464761099540000000
+      Format = 'yyyy-MM-dd'
+      Time = 40675.464761099540000000
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 1
+      Visible = False
+    end
+    object MJstr4: TEdit
+      Tag = 2
+      Left = 246
+      Top = 18
+      Width = 98
+      Height = 20
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 2
+      OnChange = MJstr4Change
+      OnKeyPress = MJstr4KeyPress
+    end
+    object YS: TEdit
+      Tag = 2
+      Left = 418
+      Top = 20
+      Width = 85
+      Height = 20
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 3
+      OnChange = MJstr4Change
+    end
+    object SH: TEdit
+      Tag = 2
+      Left = 246
+      Top = 42
+      Width = 98
+      Height = 20
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 4
+      OnChange = MJstr4Change
+    end
+    object conNo: TEdit
+      Tag = 2
+      Left = 1072
+      Top = 18
+      Width = 86
+      Height = 20
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 5
+      Visible = False
+      OnChange = MJstr4Change
+    end
+    object prtCodeName: TEdit
+      Tag = 2
+      Left = 1072
+      Top = 42
+      Width = 86
+      Height = 20
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 6
+      Visible = False
+      OnChange = MJstr4Change
+    end
+    object prtspec: TEdit
+      Tag = 2
+      Left = 633
+      Top = 18
+      Width = 85
+      Height = 20
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 7
+      Visible = False
+      OnChange = MJstr4Change
+    end
+    object Button1: TButton
+      Left = 908
+      Top = 20
+      Width = 137
+      Height = 45
+      Caption = #30830#23450#36873#25321
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 8
+      Visible = False
+      OnClick = Button1Click
+    end
+    object PRTHX: TEdit
+      Tag = 2
+      Left = 805
+      Top = 18
+      Width = 85
+      Height = 20
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      TabOrder = 9
+      Visible = False
+      OnChange = MJstr4Change
+    end
+  end
+  object cxGrid2: TcxGrid
+    Left = 0
+    Top = 128
+    Width = 1163
+    Height = 538
+    Align = alClient
+    TabOrder = 2
+    object TV2: TcxGridDBTableView
+      OnDblClick = TV2DblClick
+      Navigator.Buttons.CustomButtons = <>
+      DataController.DataSource = DataSource1
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <
+        item
+          Format = '0'
+          Position = spFooter
+        end>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsBehavior.GoToNextCellOnEnter = True
+      OptionsCustomize.ColumnFiltering = False
+      OptionsData.Editing = False
+      OptionsSelection.CellSelect = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      Styles.Inactive = DataLink_TradeManage.SHuangSe
+      Styles.IncSearch = DataLink_TradeManage.SHuangSe
+      Styles.Selection = DataLink_TradeManage.SHuangSe
+      Styles.Header = DataLink_TradeManage.Default
+      object TV2Column1: TcxGridDBColumn
+        Caption = #32568#21495
+        DataBinding.FieldName = 'mjstr4'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object TV2Column2: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'SH'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object TV2Column3: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'YS'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = TV2
+    end
+  end
+  object cxTabControl1: TcxTabControl
+    Left = 0
+    Top = 105
+    Width = 1163
+    Height = 23
+    Align = alTop
+    TabOrder = 3
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 9
+    Properties.TabIndex = 0
+    Properties.Tabs.Strings = (
+      #26410#23436#25104
+      #24050#23436#25104
+      #20840#37096)
+    OnChange = cxTabControl1Change
+    ClientRectBottom = 23
+    ClientRectRight = 1163
+    ClientRectTop = 19
+  end
+  object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 448
+    Top = 168
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_TradeManage.ADOLink
+    Parameters = <>
+    Left = 800
+    Top = 12
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TradeManage.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 944
+    Top = 24
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_TradeManage.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 720
+    Top = 216
+  end
+  object DataSource1: TDataSource
+    DataSet = Order_Main
+    Left = 824
+    Top = 184
+  end
+  object Order_Main: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 840
+    Top = 192
+  end
+end

复合检验管理/U_ClothHCList_WGH.pas

@@ -0,0 +1,245 @@
+unit U_ClothHCList_WGH;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData,
+  cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, ADODB,
+  cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
+  cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class,
+  RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxDropDownEdit,
+  cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
+  dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee,
+  dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue, dxSkinscxPCPainter, dxBarBuiltInMenu, cxPC;
+
+type
+  TfrmClothHCList_WGH = class(TForm)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBFind: TToolButton;
+    TBClose: TToolButton;
+    Panel1: TPanel;
+    BegDate: TDateTimePicker;
+    EndDate: TDateTimePicker;
+    Label1: TLabel;
+    cxGridPopupMenu1: TcxGridPopupMenu;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    DataSource1: TDataSource;
+    Label3: TLabel;
+    MJstr4: TEdit;
+    Order_Main: TClientDataSet;
+    Label6: TLabel;
+    YS: TEdit;
+    cxGrid2: TcxGrid;
+    TV2: TcxGridDBTableView;
+    cxGridLevel1: TcxGridLevel;
+    SH: TEdit;
+    conNo: TEdit;
+    Label9: TLabel;
+    prtCodeName: TEdit;
+    Label2: TLabel;
+    prtspec: TEdit;
+    Label10: TLabel;
+    Label4: TLabel;
+    Button1: TButton;
+    PRTHX: TEdit;
+    Label5: TLabel;
+    TV2Column1: TcxGridDBColumn;
+    TV2Column2: TcxGridDBColumn;
+    cxTabControl1: TcxTabControl;
+    TV2Column3: TcxGridDBColumn;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure TBFindClick(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure MJstr4Change(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure MJstr4KeyPress(Sender: TObject; var Key: Char);
+    procedure TV2DblClick(Sender: TObject);
+    procedure Button1Click(Sender: TObject);
+    procedure cxTabControl1Change(Sender: TObject);
+  private
+    FInt, PFInt: Integer;
+    procedure InitGrid();
+    procedure InitForm();
+    procedure InitGridWSQL(FWSQL: string);
+    { Private declarations }
+  public
+    fType: string;
+    { Public declarations }
+  end;
+
+var
+  frmClothHCList_WGH: TfrmClothHCList_WGH;
+
+implementation
+
+uses
+  U_DataLink, U_ClothContractInPut, U_Fun, U_ProductOrderList, U_ZDYHelp,
+  U_ProductOrderNewList_JD;
+
+{$R *.dfm}
+
+procedure TfrmClothHCList_WGH.FormDestroy(Sender: TObject);
+begin
+  frmClothHCList_WGH := nil;
+end;
+
+procedure TfrmClothHCList_WGH.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  Action := caFree;
+end;                                          
+
+procedure TfrmClothHCList_WGH.TBCloseClick(Sender: TObject);
+begin
+  Close;
+  WriteCxGrid(self.Caption + tv2.Name, Tv2, 'ָʾµ¥¹ÜÀí');
+end;
+
+procedure TfrmClothHCList_WGH.InitGrid();
+begin
+ 
+  try
+    //ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      Filtered := False;
+      sql.Clear;
+      sql.Add('select distinct isnull(mjstr4,'''')mjstr4,SH,YS from  WFB_MJJY  ');
+      if cxTabControl1.TabIndex = 0 then
+        SQL.Add('where  isnull(WCfalg,0)<>''1''');
+      if cxTabControl1.TabIndex = 1 then
+        SQL.Add('where  isnull(WCfalg,0)=''1''');
+      Open;
+    end;
+    SCreateCDS20(ADOQueryMain, Order_Main);
+    SInitCDSData20(ADOQueryMain, Order_Main);
+  finally
+    //ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmClothHCList_WGH.InitGridWSQL(FWSQL: string);
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Filtered := False;
+      Close;
+      sql.Clear;
+      sql.Add('exec P_View_HC :begdate,:enddate,:WSQL');
+      Parameters.ParamByName('begdate').Value := '2014-01-01';
+      Parameters.ParamByName('enddate').Value := '2050-01-01';
+      Parameters.ParamByName('WSQL').Value := FWSQL;
+      Open;
+    end;
+    SCreateCDS20(ADOQueryMain, Order_Main);
+    SInitCDSData20(ADOQueryMain, Order_Main);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmClothHCList_WGH.InitForm();
+begin
+  ReadCxGrid(self.Caption + tv2.Name, Tv2, 'ָʾµ¥¹ÜÀí');
+  EndDate.DateTime := SGetServerDateTime(ADOQueryTemp);
+  BegDate.DateTime := EndDate.DateTime;
+  //InitGrid();
+end;
+
+procedure TfrmClothHCList_WGH.TBFindClick(Sender: TObject);
+begin
+  if ADOQueryMain.Active = False then
+    Exit;
+  SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+  SCreateCDS20(ADOQueryMain, Order_Main);
+  SInitCDSData20(ADOQueryMain, Order_Main);
+end;
+
+procedure TfrmClothHCList_WGH.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmClothHCList_WGH.MJstr4Change(Sender: TObject);
+begin
+  if ADOQueryMain.Active = False then
+    Exit;
+  SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+  SCreateCDS20(ADOQueryMain, Order_Main);
+  SInitCDSData20(ADOQueryMain, Order_Main);
+end;
+
+procedure TfrmClothHCList_WGH.FormShow(Sender: TObject);
+begin
+  InitForm();
+  TBRafresh.Click;
+end;
+
+procedure TfrmClothHCList_WGH.MJstr4KeyPress(Sender: TObject; var Key: Char);
+var
+  fsj: string;
+begin
+  if Key = #13 then
+  begin
+    if Length(Trim(MJstr4.Text)) < 4 then
+      Exit;
+//    fsj := ' and A.MJstr4 like ''' + '%' + Trim(MJstr4.Text) + '%' + '''';
+//    InitGridWSQL(fsj);
+    try
+    //ADOQueryMain.DisableControls;
+      with ADOQueryMain do
+      begin
+        Close;
+        Filtered := False;
+        sql.Clear;
+        sql.Add('select distinct isnull(mjstr4,'''')mjstr4,SH from  WFB_MJJY where  isnull(WCfalg,0)<>''1'' ');
+        sql.Add(' and MJstr4 like ''' + '%' + Trim(MJstr4.Text) + '%' + '''');
+        Open;
+      end;
+      SCreateCDS20(ADOQueryMain, Order_Main);
+      SInitCDSData20(ADOQueryMain, Order_Main);
+    finally
+    //ADOQueryMain.EnableControls;
+    end;
+  end;
+end;
+
+procedure TfrmClothHCList_WGH.TV2DblClick(Sender: TObject);
+begin
+  if fType = '10' then
+    frmClothHCList_WGH.ModalResult := 1;
+end;
+
+procedure TfrmClothHCList_WGH.Button1Click(Sender: TObject);
+begin
+  if fType = '10' then
+    frmClothHCList_WGH.ModalResult := 1;
+end;
+
+procedure TfrmClothHCList_WGH.cxTabControl1Change(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+end.
+

复合检验管理/U_DataLink.pas

@@ -4,7 +4,21 @@ interface
 
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
-  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses;
+  Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, dxSkinsCore,
+  dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee,
+  dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans,
+  dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
+  dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue;
 var
    DConString:String;   {全局连接字符串}
    server, dtbase, user, pswd: String;  {数据库连接参数}

复合检验管理/U_GetDllForm.pas

@@ -493,8 +493,8 @@ begin
   //服务器日期
   with DataLink_TradeManage.AdoDataLink do
   begin
-    close;
+    close;                                            
-    sql.Clear;
+    sql.Clear;                          
     sql.Add('select getDate()as dt');
     open;
     DServerDate := fieldByName('dt').AsDatetime;

复合检验管理/U_JYOrderCDOne.dfm

@@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 0
     Width = 1384
-    Height = 62
+    Height = 92
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 119
@@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Top = 0
       Caption = #25209#37327#20462#25913#32568#21495
       ImageIndex = 54
+      Wrap = True
       OnClick = ToolButton11Click
     end
     object TBDW: TToolButton
-      Left = 608
+      Left = 0
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
       OnClick = TBDWClick
     end
     object ToolButton4: TToolButton
-      Left = 719
+      Left = 111
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = ToolButton4Click
     end
     object ToolButton13: TToolButton
-      Left = 830
+      Left = 222
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20928#37325#36716#38271#24230
       ImageIndex = 54
@@ -129,23 +130,22 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton13Click
     end
     object ToolButton8: TToolButton
-      Left = 953
+      Left = 345
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
       OnClick = ToolButton8Click
     end
     object ToolButton14: TToolButton
-      Left = 1064
+      Left = 456
-      Top = 0
+      Top = 30
       Caption = #25209#37327#20462#25913#31995#25968
       ImageIndex = 54
-      Wrap = True
       OnClick = ToolButton14Click
     end
     object ToolButton1: TToolButton
-      Left = 0
+      Left = 575
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -153,7 +153,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 87
+      Left = 662
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -162,33 +162,34 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 174
+      Left = 749
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
       ImageIndex = 12
+      Wrap = True
       Visible = False
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 273
+      Left = 0
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 384
+      Left = 111
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 447
+      Left = 174
-      Top = 30
+      Top = 60
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -202,8 +203,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 515
+      Left = 242
-      Top = 33
+      Top = 63
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -227,8 +228,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object Edit4: TEdit
-      Left = 664
+      Left = 391
-      Top = 30
+      Top = 60
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -241,32 +242,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 785
+      Left = 512
-      Top = 30
+      Top = 60
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
       Visible = False
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 904
+      Left = 631
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 991
+      Left = 718
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 1054
+      Left = 781
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -275,7 +276,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 62
+    Top = 92
     Width = 1384
     Height = 88
     Align = alTop
@@ -579,7 +580,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Width = 77
       Height = 20
       TabOrder = 2
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
       OnKeyPress = OrderNoKeyPress
     end
     object PRTMF: TEdit
@@ -589,7 +590,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Width = 76
       Height = 20
       TabOrder = 3
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object MJID: TEdit
       Tag = 2
@@ -597,8 +598,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Top = 37
       Width = 77
       Height = 20
-      TabOrder = 12
+      TabOrder = 11
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object CDList: TEdit
       Tag = 2
@@ -609,16 +610,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       ParentShowHint = False
       ShowHint = True
       TabOrder = 5
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
-    object PRTCodeName: TEdit
+    object PM: TEdit
       Tag = 2
       Left = 780
       Top = 8
       Width = 77
       Height = 20
       TabOrder = 10
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object MJStr2: TComboBox
       Tag = 2
@@ -628,9 +629,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Height = 20
       Style = csDropDownList
       ItemHeight = 12
-      TabOrder = 13
+      TabOrder = 12
       Visible = False
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
       Items.Strings = (
         #26410#20837#24211
         #24050#20837#24211
@@ -647,7 +648,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Style = csDropDownList
       ItemHeight = 12
       TabOrder = 4
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object RadioGroup1: TRadioGroup
       Left = 1272
@@ -664,16 +665,6 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
       OnClick = RadioGroup1Click
     end
-    object PRTColor: TComboBox
-      Tag = 1
-      Left = 626
-      Top = 10
-      Width = 77
-      Height = 20
-      ItemHeight = 12
-      TabOrder = 11
-      OnChange = PRTColorChange
-    end
     object CheckBox1: TCheckBox
       Left = 697
       Top = 107
@@ -686,7 +677,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 18
+      TabOrder = 17
       Visible = False
     end
     object MJType: TEdit
@@ -695,7 +686,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Width = 93
       Height = 20
       ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
-      TabOrder = 17
+      TabOrder = 16
       Visible = False
     end
     object BAOID: TEdit
@@ -704,9 +695,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Top = 66
       Width = 77
       Height = 20
-      TabOrder = 14
+      TabOrder = 13
       Visible = False
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object BAONO: TEdit
       Tag = 2
@@ -716,7 +707,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Height = 20
       TabOrder = 6
       Visible = False
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object SOrddefstr1: TEdit
       Tag = 1
@@ -725,16 +716,16 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Width = 77
       Height = 20
       TabOrder = 7
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
-    object PRTHX: TEdit
+    object HX: TEdit
       Tag = 2
       Left = 492
       Top = 10
       Width = 77
       Height = 20
-      TabOrder = 15
+      TabOrder = 14
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object gangno: TEdit
       Tag = 2
@@ -743,7 +734,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Width = 77
       Height = 20
       TabOrder = 8
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object PRTkuanNo: TEdit
       Tag = 2
@@ -751,8 +742,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Top = 38
       Width = 77
       Height = 20
-      TabOrder = 16
+      TabOrder = 15
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
     object CheckBox2: TCheckBox
       Left = 13
@@ -766,7 +757,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 19
+      TabOrder = 18
     end
     object BegDate: TDateTimePicker
       Left = 84
@@ -786,8 +777,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Height = 20
       Style = csDropDownList
       ItemHeight = 12
-      TabOrder = 20
+      TabOrder = 19
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
       Items.Strings = (
         ''
         #24050#20986#24211
@@ -806,24 +797,33 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 21
+      TabOrder = 20
       OnClick = CheckBox3Click
     end
-    object CustomerNoName: TEdit
+    object KH: TEdit
       Tag = 2
       Left = 357
       Top = 11
       Width = 77
       Height = 20
+      TabOrder = 21
+      OnChange = PMChange
+    end
+    object YS: TEdit
+      Tag = 1
+      Left = 626
+      Top = 10
+      Width = 76
+      Height = 20
       TabOrder = 22
-      OnChange = PRTCodeNameChange
+      OnChange = PMChange
     end
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 150
+    Top = 180
     Width = 1384
-    Height = 568
+    Height = 538
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -1167,6 +1167,18 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         HeaderAlignmentHorz = taCenter
         Width = 65
       end
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #21152#37325
+        DataBinding.FieldName = 'MJQTY5'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column8: TcxGridDBColumn
+        Caption = #21152#38271
+        DataBinding.FieldName = 'MJQty2'
+        HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1

复合检验管理/U_JYOrderCDOne.pas

@@ -11,7 +11,20 @@ uses
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI,
-  cxCurrencyEdit, MMSystem;
+  cxCurrencyEdit, MMSystem, dxSkinsCore, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
+  dxSkinscxPCPainter, StrUtils;
 
 type
   TfrmJYOrderCDOne = class(TForm)
@@ -59,7 +72,7 @@ type
     v1Column12: TcxGridDBColumn;
     v1PRTCodeName: TcxGridDBColumn;
     Label5: TLabel;
-    PRTCodeName: TEdit;
+    PM: TEdit;
     v1Column16: TcxGridDBColumn;
     Label6: TLabel;
     MJStr2: TComboBox;
@@ -82,7 +95,6 @@ type
     v1Column24: TcxGridDBColumn;
     RadioGroup1: TRadioGroup;
     MovePanel2: TMovePanel;
-    PRTColor: TComboBox;
     v1Column27: TcxGridDBColumn;
     v1Column28: TcxGridDBColumn;
     ToolButton2: TToolButton;
@@ -108,7 +120,7 @@ type
     SOrddefstr1: TEdit;
     Label13: TLabel;
     Label14: TLabel;
-    PRTHX: TEdit;
+    HX: TEdit;
     v1Column4: TcxGridDBColumn;
     v1Column5: TcxGridDBColumn;
     gangno: TEdit;
@@ -209,7 +221,7 @@ type
     Label36: TLabel;
     ComboBox3: TComboBox;
     Label37: TLabel;
-    CustomerNoName: TEdit;
+    KH: TEdit;
     v1Column29: TcxGridDBColumn;
     ToolButton14: TToolButton;
     Panel14: TPanel;
@@ -224,6 +236,9 @@ type
     Tv1Column4: TcxGridDBColumn;
     Tv1Column5: TcxGridDBColumn;
     Tv1Column6: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    YS: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -249,7 +264,7 @@ type
     procedure ToolButton2Click(Sender: TObject);
     procedure v1Column15PropertiesEditValueChanged(Sender: TObject);
     procedure TCPDBClick(Sender: TObject);
-    procedure PRTCodeNameChange(Sender: TObject);
+    procedure PMChange(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
     procedure Button6Click(Sender: TObject);
     procedure Button5Click(Sender: TObject);
@@ -395,7 +410,7 @@ begin
       Close;
       Filtered := False;
       sql.Clear;
-      sql.Add('select A.*,');
+      sql.Add('select A.dingdanhao as OrderNo,A.*,');
       SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,');
       sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,');
       sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),');
@@ -516,7 +531,7 @@ end;
 
 procedure TfrmJYOrderCDOne.TBRafreshClick(Sender: TObject);
 begin
-  Tv1.DataController.Filter.AutoDataSetFilter := false;    
+  Tv1.DataController.Filter.AutoDataSetFilter := false;
   OrderNo.SetFocus;
   MovePanel2.Visible := True;
   MovePanel2.Refresh;
@@ -903,7 +918,7 @@ procedure TfrmJYOrderCDOne.Tv1CellClick(Sender: TcxCustomGridTableView; ACellVie
 begin
   if Order_Main.IsEmpty = False then
   begin
-    InitOrderColor(Trim(Order_Main.fieldbyname('MainId').AsString), PRTColor, ADOQueryTemp);
+//    InitOrderColor(Trim(Order_Main.fieldbyname('MainId').AsString), PRTColor, ADOQueryTemp);
     //InitBCGangNo(Trim(Order_Main.fieldbyname('SubId').AsString),AOrdDefStr1,ADOQueryTemp);
     //InitRCGangNo(Trim(Order_Main.fieldbyname('SubId').AsString),GangNo,ADOQueryTemp);
   end;
@@ -1113,7 +1128,7 @@ begin
   end;
 end;
 
-procedure TfrmJYOrderCDOne.PRTCodeNameChange(Sender: TObject);
+procedure TfrmJYOrderCDOne.PMChange(Sender: TObject);
 begin
   TBFind.Click;
 end;
@@ -1598,12 +1613,12 @@ begin
       Open;
     end;
   end;
-
+                                              
-  if (trim(ComboBox1.Text) = '检验码单') then
+  if (trim(ComboBox1.Text) = '检验码单') or (trim(ComboBox1.Text) = '检验码单米') or (trim(ComboBox1.Text) = '检验码单重') then
   begin
     with ADOQueryTemp do
     begin
-      Close;
+      Close;                                         
       sql.Clear;
       sql.add('exec P_Print_CKMDYDL ');
       sql.add('@DName=' + quotedstr(Trim(DCode)));
@@ -2148,7 +2163,7 @@ end;
 procedure TfrmJYOrderCDOne.Button13Click(Sender: TObject);
 var
   fPrintFile: string;
-  Txt, fImagePath: string;
+  Txt, fImagePath, Txt1, fImagePath1: string;
   Moudle: THandle;
   Makebar: TMakebar;
   Mixtext: TMixtext;
@@ -2183,22 +2198,7 @@ begin
           sql.Add(' where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + '''');
           ExecSQL;
         end;
-        try
+
-          Moudle := LoadLibrary('MakeQRBarcode.dll');
-          @Makebar := GetProcAddress(Moudle, 'Make');
-          @Mixtext := GetProcAddress(Moudle, 'MixText');
-          Txt := Trim(Order_Main.fieldbyname('MJID').AsString);
-          fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
-          if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then
-            CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil);
-          if FileExists(fImagePath) then
-            DeleteFile(fImagePath);
-          Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3);
-        except
-          application.MessageBox('条形码生成失败！', '提示信息', MB_ICONERROR);
-          Order_Main.EnableControls;
-          exit;
-        end;
         with ADOQueryPrint do
         begin
           Close;
@@ -2221,6 +2221,38 @@ begin
           sql.Add('@MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''' ');
           Open;
         end;
+        try
+          Moudle := LoadLibrary('MakeQRBarcode.dll');
+          @Makebar := GetProcAddress(Moudle, 'Make');
+          @Mixtext := GetProcAddress(Moudle, 'MixText');
+          Txt := Trim(Order_Main.fieldbyname('MJID').AsString);
+          fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
+          if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then
+            CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil);
+          if FileExists(fImagePath) then
+            DeleteFile(fImagePath);
+          Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3);
+        except
+          application.MessageBox('条形码生成失败！', '提示信息', MB_ICONERROR);
+          Order_Main.EnableControls;
+          exit;
+        end;
+        try
+          Moudle := LoadLibrary('MakeQRBarcode.dll');
+          @Makebar := GetProcAddress(Moudle, 'Make');
+          @Mixtext := GetProcAddress(Moudle, 'MixText');
+          Txt1 := '&' + Trim(ADOQueryPrint.fieldbyname('PM').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('YS').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJFK').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJSJKZ').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJStr4').AsString) + '&' + RightStr(('10000' + trim(ADOQueryPrint.fieldbyName('MJXH').AsString)), 4) + '&' + Trim(ADOQueryPrint.fieldbyname('MJMaoZ').AsString);
+          fImagePath1 := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
+          if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image1')) then
+            CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image1'), nil);
+          if FileExists(fImagePath1) then
+            DeleteFile(fImagePath1);
+          Makebar(pchar(Txt1), Length(Txt1), 3, 3, 0, PChar(fImagePath1), 3);
+        except
+          application.MessageBox('条形码生成失败！', '提示信息', MB_ICONERROR);
+          Order_Main.EnableControls;
+          exit;
+        end;
         if Trim(ADOQueryPrint.fieldbyname('SLbName').AsString) <> '' then
         begin
           ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('SLbName').AsString), ADOQueryCmd);
@@ -2246,6 +2278,7 @@ begin
         if FileExists(fPrintFile) then
         begin
           RMVariables['QRBARCODE'] := fImagePath;
+          RMVariables['QRBARCODE1'] := fImagePath1;
           if ComboBox2.Text = 'Ó¢ÎÄ×ֶαêÇ©' then
           begin
             RM2.LoadFromFile(fPrintFile);

复合检验管理/U_MJManageNewFDNew.dfm

@@ -1,8 +1,8 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 540
+  Left = 359
-  Top = 169
+  Top = 159
   Width = 1368
-  Height = 754
+  Height = 800
   Caption = #25104#21697#26816#39564
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -47,7 +47,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 425
-    Height = 636
+    Height = 674
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -191,8 +191,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ScrollBox1: TScrollBox
     Left = 1151
     Top = 87
-    Width = 209
+    Width = 201
-    Height = 636
+    Height = 674
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -1043,7 +1043,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 425
     Top = 87
     Width = 512
-    Height = 636
+    Height = 674
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1051,7 +1051,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     TabOrder = 2
     object Label9: TLabel
       Left = 152
-      Top = 78
+      Top = 80
       Width = 15
       Height = 22
       Caption = 'M'
@@ -1065,7 +1065,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label3: TLabel
       Left = 144
-      Top = 352
+      Top = 347
       Width = 26
       Height = 22
       Caption = 'cm'
@@ -1078,7 +1078,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label4: TLabel
       Left = 152
-      Top = 185
+      Top = 186
       Width = 28
       Height = 22
       Caption = 'KG'
@@ -1104,7 +1104,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label6: TLabel
       Left = 8
-      Top = 352
+      Top = 347
       Width = 42
       Height = 20
       Caption = #24133#23485
@@ -1117,7 +1117,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label11: TLabel
       Left = 8
-      Top = 187
+      Top = 188
       Width = 42
       Height = 20
       Caption = #27611#37325
@@ -1130,7 +1130,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label10: TLabel
       Left = 8
-      Top = 265
+      Top = 260
       Width = 42
       Height = 20
       Caption = #27491#21697
@@ -1143,7 +1143,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label12: TLabel
       Left = 92
-      Top = 265
+      Top = 260
       Width = 40
       Height = 19
       Caption = #27425#21697
@@ -1155,8 +1155,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label13: TLabel
-      Left = 458
+      Left = 402
-      Top = 428
+      Top = 580
       Width = 15
       Height = 22
       Caption = 'M'
@@ -1169,8 +1169,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label14: TLabel
-      Left = 283
+      Left = 211
-      Top = 428
+      Top = 628
       Width = 60
       Height = 23
       Caption = #21407#25968#37327
@@ -1197,7 +1197,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label22: TLabel
       Left = 144
-      Top = 393
+      Top = 381
       Width = 36
       Height = 22
       Caption = 'g/'#13217
@@ -1210,7 +1210,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label23: TLabel
       Left = 8
-      Top = 392
+      Top = 380
       Width = 42
       Height = 20
       Caption = #20811#37325
@@ -1222,22 +1222,21 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label27: TLabel
-      Left = 219
+      Left = 355
-      Top = 551
+      Top = 308
-      Width = 40
+      Width = 42
-      Height = 23
+      Height = 20
-      Caption = #36192#36865
+      Caption = #21152#38271
-      Font.Charset = ANSI_CHARSET
+      Font.Charset = GB2312_CHARSET
-      Font.Color = clRed
+      Font.Color = clBlue
       Font.Height = -20
-      Font.Name = 'Arial'
+      Font.Name = #23435#20307
-      Font.Style = []
+      Font.Style = [fsBold]
       ParentFont = False
-      Visible = False
     end
     object Label26: TLabel
       Left = 8
-      Top = 308
+      Top = 303
       Width = 42
       Height = 20
       Caption = #20986#32440
@@ -1249,8 +1248,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label29: TLabel
-      Left = 284
+      Left = 212
-      Top = 384
+      Top = 584
       Width = 58
       Height = 23
       Caption = #26588'   '#21495
@@ -1264,7 +1263,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label30: TLabel
       Left = 8
-      Top = 115
+      Top = 116
       Width = 42
       Height = 20
       Caption = #30382#37325
@@ -1277,7 +1276,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label31: TLabel
       Left = 152
-      Top = 149
+      Top = 150
       Width = 28
       Height = 22
       Caption = 'KG'
@@ -1290,7 +1289,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label32: TLabel
       Left = 8
-      Top = 151
+      Top = 152
       Width = 42
       Height = 20
       Caption = #20928#37325
@@ -1303,7 +1302,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label33: TLabel
       Left = 152
-      Top = 114
+      Top = 115
       Width = 28
       Height = 22
       Caption = 'KG'
@@ -1316,7 +1315,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label34: TLabel
       Left = 90
-      Top = 311
+      Top = 306
       Width = 40
       Height = 19
       Caption = #20221#25968
@@ -1355,7 +1354,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label39: TLabel
       Left = 8
-      Top = 223
+      Top = 224
       Width = 42
       Height = 20
       Caption = #31995#25968
@@ -1367,8 +1366,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label40: TLabel
-      Left = 208
+      Left = 232
-      Top = 489
+      Top = 665
       Width = 80
       Height = 22
       Caption = #26579#21378#32568#21495
@@ -1380,23 +1379,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
       Visible = False
     end
-    object Label45: TLabel
-      Left = 223
-      Top = 388
-      Width = 40
-      Height = 23
-      Caption = #21253#21495
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clRed
-      Font.Height = -20
-      Font.Name = 'Arial'
-      Font.Style = []
-      ParentFont = False
-      Visible = False
-    end
     object Label28: TLabel
-      Left = 274
+      Left = 50
-      Top = 604
+      Top = 620
       Width = 42
       Height = 20
       Caption = #21253#21495
@@ -1410,7 +1395,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label53: TLabel
       Left = 208
-      Top = 5
+      Top = 47
       Width = 42
       Height = 20
       Caption = #23458#25143
@@ -1423,7 +1408,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label55: TLabel
       Left = 208
-      Top = 141
+      Top = 183
       Width = 42
       Height = 20
       Caption = #39068#33394
@@ -1436,7 +1421,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label57: TLabel
       Left = 208
-      Top = 49
+      Top = 91
       Width = 42
       Height = 20
       Caption = #21697#21517
@@ -1449,7 +1434,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label58: TLabel
       Left = 208
-      Top = 97
+      Top = 139
       Width = 42
       Height = 20
       Caption = #33457#22411
@@ -1462,7 +1447,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label59: TLabel
       Left = 208
-      Top = 229
+      Top = 271
       Width = 42
       Height = 20
       Caption = #26631#31614
@@ -1475,7 +1460,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label60: TLabel
       Left = 208
-      Top = 189
+      Top = 231
       Width = 42
       Height = 20
       Caption = #33394#21495
@@ -1488,7 +1473,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label62: TLabel
       Left = 208
-      Top = 266
+      Top = 308
       Width = 42
       Height = 20
       Caption = #21152#37325
@@ -1499,22 +1484,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
     end
-    object Label63: TLabel
-      Left = 352
-      Top = 266
-      Width = 28
-      Height = 22
-      Caption = 'KG'
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clBlue
-      Font.Height = -19
-      Font.Name = 'Arial'
-      Font.Style = []
-      ParentFont = False
-    end
     object Label64: TLabel
-      Left = 209
+      Left = 385
-      Top = 310
+      Top = 614
       Width = 84
       Height = 20
       AutoSize = False
@@ -1525,12 +1497,66 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
+    end
+    object Label45: TLabel
+      Left = 352
+      Top = 349
+      Width = 42
+      Height = 20
+      Caption = #35268#26684
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label63: TLabel
+      Left = 208
+      Top = 348
+      Width = 42
+      Height = 20
+      Caption = #30721#23610
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label65: TLabel
+      Left = 189
+      Top = 8
+      Width = 63
+      Height = 20
+      Caption = #35746#21333#21495
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label67: TLabel
+      Left = 208
+      Top = 388
+      Width = 84
+      Height = 20
+      Caption = #38271#24230#20301#25968
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
     end
     object MJFK: TEdit
       Left = 51
-      Top = 346
+      Top = 341
       Width = 90
-      Height = 41
+      Height = 33
+      AutoSize = False
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -32
@@ -1560,7 +1586,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJMaoZ: TEdit
       Left = 57
-      Top = 183
+      Top = 184
       Width = 90
       Height = 36
       Font.Charset = GB2312_CHARSET
@@ -1576,9 +1602,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object BTPrint: TButton
       Left = 10
-      Top = 429
+      Top = 424
       Width = 171
-      Height = 93
+      Height = 98
       Caption = #25552#20132
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -1591,7 +1617,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit3: TEdit
       Left = 52
-      Top = 259
+      Top = 254
       Width = 39
       Height = 43
       Font.Charset = GB2312_CHARSET
@@ -1608,7 +1634,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit4: TEdit
       Left = 130
-      Top = 259
+      Top = 254
       Width = 40
       Height = 43
       Font.Charset = GB2312_CHARSET
@@ -1623,8 +1649,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJQty1: TEdit
-      Left = 353
+      Left = 281
-      Top = 419
+      Top = 619
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1641,9 +1667,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJSJKZ: TEdit
       Left = 51
-      Top = 387
+      Top = 375
       Width = 90
-      Height = 41
+      Height = 33
+      AutoSize = False
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -32
@@ -1655,8 +1682,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJQty2: TEdit
-      Left = 273
+      Left = 401
-      Top = 550
+      Top = 299
       Width = 90
       Height = 36
       Font.Charset = GB2312_CHARSET
@@ -1666,7 +1693,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 17
-      Visible = False
       OnChange = MJQty2Change
       OnClick = Edit1Click
       OnKeyDown = MJQty4KeyDown
@@ -1674,7 +1700,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Edit6: TEdit
       Left = 52
-      Top = 302
+      Top = 297
       Width = 40
       Height = 43
       Font.Charset = GB2312_CHARSET
@@ -1690,8 +1716,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJstr3: TEdit
-      Left = 353
+      Left = 281
-      Top = 379
+      Top = 579
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1708,7 +1734,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJQty3: TEdit
       Left = 57
-      Top = 111
+      Top = 112
       Width = 90
       Height = 36
       Font.Charset = GB2312_CHARSET
@@ -1725,7 +1751,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJQty4: TEdit
       Left = 57
-      Top = 147
+      Top = 148
       Width = 90
       Height = 36
       Font.Charset = GB2312_CHARSET
@@ -1742,7 +1768,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object ComboBox1: TComboBox
       Left = 132
-      Top = 303
+      Top = 298
       Width = 45
       Height = 40
       Style = csDropDownList
@@ -1797,9 +1823,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object kmxs: TEdit
       Left = 57
-      Top = 219
+      Top = 220
       Width = 90
-      Height = 36
+      Height = 33
+      AutoSize = False
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -28
@@ -1812,8 +1839,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJstr5: TEdit
-      Left = 293
+      Left = 317
-      Top = 480
+      Top = 656
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1829,8 +1856,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object baoNo: TEdit
-      Left = 321
+      Left = 97
-      Top = 597
+      Top = 613
       Width = 90
       Height = 36
       Font.Charset = GB2312_CHARSET
@@ -1845,8 +1872,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object BaoID: TEdit
-      Left = 259
+      Left = 35
-      Top = 344
+      Top = 592
       Width = 121
       Height = 20
       TabOrder = 10
@@ -1869,7 +1896,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object KH: TBtnEditA
       Left = 256
-      Top = 0
+      Top = 42
       Width = 145
       Height = 37
       AutoSize = False
@@ -1884,7 +1911,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object PM: TBtnEditA
       Left = 256
-      Top = 44
+      Top = 86
       Width = 145
       Height = 37
       AutoSize = False
@@ -1900,7 +1927,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object YS: TBtnEditA
       Left = 256
-      Top = 132
+      Top = 174
       Width = 145
       Height = 37
       AutoSize = False
@@ -1916,7 +1943,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object HX: TBtnEditA
       Left = 256
-      Top = 88
+      Top = 130
       Width = 145
       Height = 37
       AutoSize = False
@@ -1932,7 +1959,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object SH: TBtnEditA
       Left = 256
-      Top = 176
+      Top = 218
       Width = 145
       Height = 37
       AutoSize = False
@@ -1948,7 +1975,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object SLbName: TFTComboBox
       Left = 256
-      Top = 220
+      Top = 262
       Width = 185
       Height = 32
       Font.Charset = GB2312_CHARSET
@@ -1969,7 +1996,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Button9: TButton
       Left = 384
-      Top = 0
+      Top = 42
       Width = 65
       Height = 38
       Caption = #36873#25321#23458#25143
@@ -1984,7 +2011,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Button10: TButton
       Left = 384
-      Top = 40
+      Top = 82
       Width = 65
       Height = 38
       Caption = #36873#25321#21697#21517
@@ -1999,7 +2026,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Button11: TButton
       Left = 384
-      Top = 128
+      Top = 170
       Width = 65
       Height = 38
       Caption = #36873#25321#39068#33394
@@ -2014,7 +2041,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Button12: TButton
       Left = 384
-      Top = 176
+      Top = 218
       Width = 65
       Height = 38
       Caption = #36873#25321#33394#21495
@@ -2029,7 +2056,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Button13: TButton
       Left = 384
-      Top = 88
+      Top = 130
       Width = 65
       Height = 38
       Caption = #36873#25321#33457#22411
@@ -2044,7 +2071,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object MJQty5: TEdit
       Left = 257
-      Top = 259
+      Top = 301
       Width = 90
       Height = 36
       Font.Charset = GB2312_CHARSET
@@ -2054,14 +2081,13 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 32
-      OnChange = MJQty5Change
       OnClick = Edit1Click
       OnKeyPress = MJstr3KeyPress
     end
     object MJLen1: TEdit
-      Left = 304
+      Left = 472
-      Top = 303
+      Top = 607
-      Width = 137
+      Width = 81
       Height = 41
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -2070,11 +2096,94 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 33
+      Visible = False
       OnChange = MJLen1Change
       OnClick = Edit1Click
       OnKeyDown = MJQty4KeyDown
       OnKeyPress = MJstr3KeyPress
     end
+    object Button5: TButton
+      Left = 216
+      Top = 429
+      Width = 75
+      Height = 57
+      Caption = #21367#21495#37325#32622
+      TabOrder = 34
+      OnClick = Button5Click
+    end
+    object MJspec: TFTComboBox
+      Left = 400
+      Top = 342
+      Width = 89
+      Height = 32
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -24
+      Font.Name = #23435#20307
+      Font.Style = []
+      ItemHeight = 24
+      ParentFont = False
+      TabOrder = 35
+      Text = #20108#21512#19968
+      Items.Strings = (
+        #20108#21512#19968
+        #19977#21512#19968)
+    end
+    object MJmachi: TEdit
+      Left = 255
+      Top = 341
+      Width = 90
+      Height = 36
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 36
+      OnClick = Edit1Click
+      OnKeyPress = MJstr3KeyPress
+    end
+    object dingdanhao: TEdit
+      Left = 257
+      Top = 4
+      Width = 136
+      Height = 36
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' ('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 37
+      OnClick = MJXHClick
+      OnKeyPress = MJstr3KeyPress
+    end
+    object MJCWS: TEdit
+      Left = 293
+      Top = 381
+      Width = 90
+      Height = 36
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 38
+      OnClick = Edit1Click
+      OnKeyPress = MJstr3KeyPress
+    end
+    object GHWC: TButton
+      Left = 304
+      Top = 429
+      Width = 75
+      Height = 57
+      Caption = #32568#21495#23436#25104
+      TabOrder = 39
+      OnClick = GHWCClick
+    end
   end
   object MovePanel1: TMovePanel
     Left = 1158
@@ -2330,7 +2439,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 937
     Top = 87
     Width = 214
-    Height = 636
+    Height = 674
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2339,7 +2448,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Left = 2
       Top = 2
       Width = 210
-      Height = 311
+      Height = 349
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2447,7 +2556,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 313
+      Top = 351
       Width = 210
       Height = 28
       Align = alBottom
@@ -2462,7 +2571,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 341
+      Top = 379
       Width = 210
       Height = 293
       Align = alBottom
@@ -2478,8 +2587,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object Panel3: TPanel
-    Left = 1066
+    Left = 942
-    Top = 356
+    Top = 323
     Width = 353
     Height = 334
     BevelInner = bvRaised
@@ -2675,11 +2784,11 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1360
+    Width = 1352
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 105
+    ButtonWidth = 135
     Caption = 'ToolBar1'
     Color = clSkyBlue
     EdgeInner = esNone
@@ -2836,9 +2945,24 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ImageIndex = 72
       OnClick = ToolButton4Click
     end
-    object TBClose: TToolButton
+    object ToolButton1: TToolButton
       Left = 851
       Top = 0
+      Caption = #26410#23436#25104#32568#21495
+      ImageIndex = 57
+      OnClick = ToolButton1Click
+    end
+    object ToolButton5: TToolButton
+      Left = 986
+      Top = 0
+      AutoSize = True
+      Caption = #37325#36830
+      ImageIndex = 68
+      OnClick = ToolButton5Click
+    end
+    object TBClose: TToolButton
+      Left = 1065
+      Top = 0
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -2848,7 +2972,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1360
+    Width = 1352
     Height = 57
     Align = alTop
     BevelInner = bvRaised
@@ -3250,8 +3374,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
   end
   object ScrollBox2: TScrollBox
-    Left = -64
+    Left = -456
-    Top = 424
+    Top = 720
     Width = 481
     Height = 457
     Font.Charset = GB2312_CHARSET
@@ -3847,8 +3971,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   end
   object cxGridPopupMenu2: TcxGridPopupMenu
     PopupMenus = <>
-    Left = 740
+    Left = 956
-    Top = 551
+    Top = 279
   end
   object ADOQueryMainDSC: TADOQuery
     Connection = DataLink_TradeManage.ADOLink
@@ -3911,4 +4035,10 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Top = 544
     ReportData = {}
   end
+  object QryCheckNet: TADOQuery
+    Connection = DataLink_TradeManage.ADOLink
+    Parameters = <>
+    Left = 720
+    Top = 425
+  end
 end

复合检验管理/U_MJManageNewFDNew.pas

@@ -216,7 +216,6 @@ type
     Label42: TLabel;
     v2Column4: TcxGridDBColumn;
     baoNo: TEdit;
-    Label45: TLabel;
     BaoID: TEdit;
     Button7: TButton;
     v3Column6: TcxGridDBColumn;
@@ -316,11 +315,23 @@ type
     Button8: TButton;
     Label62: TLabel;
     MJQty5: TEdit;
-    Label63: TLabel;
     Label64: TLabel;
     MJLen1: TEdit;
     Edit15: TEdit;
     Label66: TLabel;
+    Button5: TButton;
+    Label45: TLabel;
+    MJspec: TFTComboBox;
+    Label63: TLabel;
+    MJmachi: TEdit;
+    Label65: TLabel;
+    dingdanhao: TEdit;
+    Label67: TLabel;
+    MJCWS: TEdit;
+    GHWC: TButton;
+    ToolButton1: TToolButton;
+    ToolButton5: TToolButton;
+    QryCheckNet: TADOQuery;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -397,6 +408,10 @@ type
     procedure MJQty5Change(Sender: TObject);
     procedure MJLen1Change(Sender: TObject);
     procedure Edit15Click(Sender: TObject);
+    procedure Button5Click(Sender: TObject);
+    procedure GHWCClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure ToolButton5Click(Sender: TObject);
   private
     { Private declarations }
     FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
@@ -424,6 +439,8 @@ type
     procedure On1201(var Message: Tmessage); message 1201;
     procedure On1301(var Message: Tmessage); message 1301;
     function JsXj(str1: string): string;
+    function SelfConnData(): Boolean;
+    procedure clearCom(DllName: string);
   public
     fmanage, ftest: string;
     { Public declarations }
@@ -432,16 +449,48 @@ type
 
 var
   frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF;
-  newh, newh1: hwnd;
+  newh, newh1, newh2: hwnd;
   S1: Boolean;
 
 implementation
 
 uses
   U_DataLink, U_Fun, U_ZDYHelp, U_ZDYHelp12, U_iniParam, U_ClothHCList, MMSystem,
-  U_SCPersonColor, U_SysLogOrder;
+  U_SCPersonColor, U_SysLogOrder, U_ClothHCList_WGH;
 
 {$R *.dfm}
+procedure TfrmMJManageNewFDNewSF.clearCom(DllName: string);
+type
+  TMyFunc = function(sCommName: PAnsiChar): HWND; stdcall;
+var
+  Tf1: TMyFunc;
+  Tp1: TFarProc;
+  Th1: Thandle;
+begin
+  Th1 := LoadLibrary(Pchar(trim(DllName)));
+  if Th1 > 0 then
+  begin
+    try
+      Tp1 := GetProcAddress(Th1, 'CommClear');
+      if Tp1 <> nil then
+      begin
+        Tf1 := TMyFunc(Tp1);
+        newh2 := Tf1('Comm1');
+      end
+      else
+      begin
+
+      end;
+    finally
+    // FreeLibrary(Th1);
+    end;
+  end
+  else
+  begin
+    application.MessageBox(Pchar('找不到 ' + trim(DllName) + ' 文件！'), '提示');
+  end;
+end;
+
 procedure TfrmMJManageNewFDNewSF.PrtBaoData(FBaoid: string);
 var
   fPrintFile: string;
@@ -556,7 +605,7 @@ end;
 procedure TfrmMJManageNewFDNewSF.On1301(var Message: Tmessage);
 var
   i1, i2: integer;
-  unitname: string;
+  unitname, Fmjlen: string;
   fdata: double;
 begin
   i1 := Message.WParam;
@@ -565,9 +614,16 @@ begin
   begin
     if (trim(Edit7.Text) = '√') then
     begin
+      if S1 = true then
+      begin
+        if i1 = 0 then
+        begin
+          BTPrint.Click;
+        end;
+      end;
       if i1 > 0 then
       begin
-        MJLen.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
+        MJLen.Text := format('%.' + trim(MJCWS.text) + 'f', [i1 / 100000]);
       end
       else
       begin
@@ -577,14 +633,8 @@ begin
         Label9.Caption := 'M'
       else
         Label9.Caption := 'Y';
-      edit1.Text := format('%.' + trim(fxsws) + 'f', [i1 / 100000]);
+      edit1.Text := format('%.' + trim(MJCWS.text) + 'f', [i1 / 100000]);
-      if S1 = true then
+
-      begin
-        if i1 = 0 then
-        begin
-          BTPrint.Click;
-        end;
-      end;
     end;
   end;
 
@@ -729,6 +779,7 @@ begin
     if Trim(SCXFlag) <> '' then
       sql.Add(' and JTType=''' + Trim(SCXFlag) + '''');
     sql.Add('and mjstr2=''未入库'' ');
+    SQL.Add('and isnull(WCfalg,''0'')=''0''');
     sql.Add(' order by FillTime desc');
     Open;
   end;
@@ -1045,6 +1096,7 @@ begin
           sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) ');
           sql.Add('from WFB_MJJY X where X.subID=''' + trim(FSubId) + ''' ');
           sql.add('and X.MJStr4=' + quotedstr(trim(MJstr4.text)));
+          sql.add('and X.dingdanhao=' + quotedstr(trim(dingdanhao.text)));
           Open;
           MJXH.Text := Trim(fieldbyname('maxRoll').AsString);
         end;
@@ -1156,7 +1208,8 @@ begin
       FieldByName('YS').Value := Trim(YS.Text);
       FieldByName('HX').Value := Trim(HX.Text);
       FieldByName('SH').Value := Trim(SH.Text);
-
+      FieldByName('MJspec').Value := Trim(MJspec.Text);
+      FieldByName('dingdanhao').Value := Trim(dingdanhao.Text);
       if Edit12.Text <> '' then
       begin
         FieldByName('DingMaFlag').Value := '定长';
@@ -1172,13 +1225,14 @@ begin
       end
       else
       begin
-        FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
+//        FieldByName('MJLen').Value := format('%.' + trim(fxsws) + 'f', [((StrToFloatdef(trim(MJLen.Text), 0) / (StrToFloatdef(trim(MJmachi.Text), 100) / 100)) + StrToFloatdef(trim(MJQty2.Text), 0) + fjc)]);
+        FieldByName('MJLen').Value := format('%.' + trim(MJCWS.text) + 'f', [((StrToFloatdef(trim(MJLen.Text), 0) / (StrToFloatdef(trim(MJmachi.Text), 100) / 100)) + StrToFloatdef(trim(MJQty2.Text), 0) + fjc)]);
       end;
 
       FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0);
       FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0);
       FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0);
-      FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ;
+      FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + StrToFloatdef(trim(MJQty5.Text), 0) + fjZ;
       FieldByName('MJQty5').Value := StrToFloatdef(trim(MJQty5.Text), 0);
       if Trim(MJFK.Text) <> '' then
       begin
@@ -1186,7 +1240,7 @@ begin
       end;
       if Trim(MJMaoZ.Text) <> '' then
       begin
-        FieldByName('MJMaoZ').Value := StrToFloat(MJMaoZ.Text) + fjz;
+        FieldByName('MJMaoZ').Value := StrToFloat(MJMaoZ.Text) + StrToFloatdef(trim(MJQty5.Text), 0) + fjz;
       end;
       if Trim(MJSJKZ.Text) <> '' then
       begin
@@ -1249,7 +1303,7 @@ begin
             Close;
             sql.Clear;
             sql.Add('update WFB_MJJY SET mjxh=1+isnull((select cast (max(mjxh) as int) from WFB_MJJY X ');
-            sql.Add(' where X.subID=WFB_MJJY.subID and isnull(X.mjstr4,'''')=isnull(WFB_MJJY.mjstr4,'''') and X.MJID<>WFB_MJJY.MJID),0)');
+            sql.Add(' where X.subID=WFB_MJJY.subID and isnull(X.mjstr4,'''')=isnull(WFB_MJJY.mjstr4,'''') and isnull(X.dingdanhao,'''')=isnull(WFB_MJJY.dingdanhao,'''') and X.MJID<>WFB_MJJY.MJID),0) ');
             sql.Add('where MJID=''' + Trim(maxno) + '''');
             execsql;
           end;
@@ -1374,6 +1428,7 @@ begin
         Close;
         sql.Clear;
         sql.Add('select Mainid,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + '''');
+
         sql.Add(' Group by Mainid,MJXH having count(*)>1');
         Open;
       end;
@@ -1396,7 +1451,7 @@ begin
         Close;
         SQL.Clear;
         sql.Add('select Top 1 MJXH,MJID from WFB_MJJY A  ');
-        sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and  isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
+        sql.Add(' where A.mainID=''' + Trim(FMainId) + ''' and  isnull(A.dingdanhao,'''')=''' + Trim(dingdanhao.Text) + ''' and  isnull(A.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
         sql.Add(' order by MJXH Desc');
         Open;
       end;
@@ -1461,7 +1516,7 @@ begin
       begin
         Close;
         sql.Clear;
-        sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
+        sql.Add('select subid,MJStr4,MJXH from WFB_MJJY X where X.mainID=''' + Trim(FMainId) + ''' and isnull(X.dingdanhao,'''')=''' + Trim(dingdanhao.Text) + ''' and isnull(X.MJStr4,'''')=''' + Trim(MJStr4.Text) + '''');
         sql.Add(' Group by subid,MJStr4,MJXH having count(*)>1');
         Open;
       end;
@@ -1718,7 +1773,10 @@ begin
     application.MessageBox('卷号不能为空', '提示');
     exit;
   end;
-
+  if trim(MJCWS.text) = '' then
+  begin
+    MJCWS.text := '1';
+  end;
   if trim(MJXH.text) = '0' then
   begin
     application.MessageBox('卷号不能为0', '提示');
@@ -1793,7 +1851,7 @@ begin
   begin
     MJMaoZ.Text := '';
     MJQty1.Text := '';
-    MJQty2.Text := '';
+//    MJQty2.Text := '';
     Label15.Caption := '';
     MJQty4.Text := '';
 
@@ -1856,7 +1914,6 @@ begin
         end;
         Open;
       end;
-
       if trim(ADOCmd.FieldByName('baoid').AsString) <> '' then
       begin
         PrtBaoData(ADOCmd.fieldbyname('baoid').AsString);
@@ -1866,6 +1923,13 @@ begin
   end;
 
   Label16.Caption := '';
+
+  if Trim(Edit7.Text) = '√' then
+  begin
+    if trim(JCYDLL) <> '' then
+      clearCom(JCYDLL);
+  end;
+
   BTAdd.Click;
   MJLen.SetFocus;
 //  MJQty4.OnClick(MJQty4);
@@ -1928,7 +1992,7 @@ begin
     Moudle := LoadLibrary('MakeQRBarcode.dll');
     @Makebar := GetProcAddress(Moudle, 'Make');
     @Mixtext := GetProcAddress(Moudle, 'MixText');
-    Txt1 := '&' + Trim(ADOQueryPrint.fieldbyname('PRTcodename').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('SH').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJFK').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJSJKZ').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJStr4').AsString) + '&' + RightStr(('10000' + trim(ADOQueryPrint.fieldbyName('MJXH').AsString)), 4) + '&' + Trim(ADOQueryPrint.fieldbyname('MJMaoZ').AsString);
+    Txt1 := '&' + Trim(ADOQueryPrint.fieldbyname('PM').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('YS').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJFK').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJSJKZ').AsString) + '&' + Trim(ADOQueryPrint.fieldbyname('MJStr4').AsString) + '&' + RightStr(('10000' + trim(ADOQueryPrint.fieldbyName('MJXH').AsString)), 4) + '&' + Trim(ADOQueryPrint.fieldbyname('MJMaoZ').AsString);
     fImagePath1 := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
     if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image1')) then
       CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image1'), nil);
@@ -2551,17 +2615,18 @@ begin
     Label25.Caption := '色号:' + Trim(ADOTmp.fieldbyname('SOrddefstr1').AsString);
     Label47.Visible := true;
     Label47.Caption := '颜色:' + Trim(ADOTmp.fieldbyname('PRTcolor').AsString);
-    if Trim(ADOTmp.fieldbyname('PRTHX').AsString) <> '' then
+//    if Trim(ADOTmp.fieldbyname('PRTHX').AsString) <> '' then
-    begin
+//    begin
-      Label2.Visible := true;
+    Label2.Visible := true;
-      Label2.Caption := '»¨ÐÍ:' + Trim(ADOTmp.fieldbyname('PRTHX').AsString);
+    Label2.Caption := '数量:' + Trim(ADOTmp.fieldbyname('PRTOrderQty').AsString);
-    end;
+//    end;
+    dingdanhao.Text := Trim(ADOTmp.fieldbyname('orderno').AsString);
     PM.Text := Trim(ADOTmp.fieldbyname('PRTCodeName').AsString);
     KH.Text := Trim(ADOTmp.fieldbyname('CustomerNoName').AsString);
     YS.Text := Trim(ADOTmp.fieldbyname('PRTColor').AsString);
     HX.Text := Trim(ADOTmp.fieldbyname('PRTHX').AsString);
     SH.Text := Trim(ADOTmp.fieldbyname('SOrddefstr1').AsString);
-    MJQty5.Text := FloatToStr(ADOTmp.fieldbyname('jiazhong').AsFloat);
+//    MJQty5.Text := FloatToStr(ADOTmp.fieldbyname('jiazhong').AsFloat);
 
     FAPID := Trim(ADOTmp.fieldbyname('SubId').AsString);
     FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString);
@@ -2602,6 +2667,7 @@ begin
       MJXH.Text := inttostr(ADOTmp.fieldbyname('minMJxh').AsInteger - 1);
     end;
     fxsws := Trim(ADOTmp.fieldbyname('xsws').AsString);
+    MJCWS.Text := Trim(ADOTmp.fieldbyname('xsws').AsString);
     fxsws1 := Trim(ADOTmp.fieldbyname('xsws1').AsString);
     baoNO.Text := Trim(ADOTmp.fieldbyname('maxBaoNO').AsString);
     if GetLSNo(ADOCmd, FBaoID, 'BI', 'WFB_MJJY', 3, 1) = False then
@@ -2691,6 +2757,7 @@ end;
 procedure TfrmMJManageNewFDNewSF.MJLenChange(Sender: TObject);
 begin
 //  MJLen.Text:=JsXj(MJLen.Text);
+  MJLen1.Text := MJLen.Text;              
 end;
 
 procedure TfrmMJManageNewFDNewSF.MJQty3Change(Sender: TObject);
@@ -2734,6 +2801,7 @@ begin
         sql.Add('select maxRoll=1+isnull(cast(max(mjxh) as int),0) ');
         sql.Add('from WFB_MJJY X where X.subID=''' + trim(FSubId) + ''' ');
         sql.add('and X.MJStr4=' + quotedstr(trim(MJstr4.text)));
+        sql.add('and X.dingdanhao=' + quotedstr(trim(dingdanhao.text)));
         Open;
         MJXH.Text := Trim(fieldbyname('maxRoll').AsString);
       end;
@@ -2775,6 +2843,7 @@ begin
             sql.Add('select maxRoll=isnull(cast(min(mjxh) as int),1)-1 ');
             sql.Add('from WFB_MJJY X where X.subID=''' + trim(FSubId) + ''' ');
             sql.add('and X.MJStr4=' + quotedstr(trim(MJstr4.text)));
+            sql.add('and X.dingdanhao=' + quotedstr(trim(dingdanhao.text)));
             Open;
             MJXH.Text := Trim(fieldbyname('maxRoll').AsString);
           end;
@@ -2845,6 +2914,8 @@ begin
   MJXH.Text := Trim(ADOTmp.fieldbyname('MJXH').AsString);
   baono.Text := Trim(ADOTmp.fieldbyname('baono').AsString);
   baoid.Text := Trim(ADOTmp.fieldbyname('baoid').AsString);
+  dingdanhao.Text := Trim(ADOTmp.fieldbyname('dingdanhao').AsString);
+  MJspec.Text := Trim(ADOTmp.fieldbyname('MJspec').AsString);
   if Trim(ADOTmp.fieldbyname('MJType').AsString) = '正品' then
   begin
     Edit3.Text := '√';
@@ -3238,6 +3309,10 @@ begin
   finally
     frmSCPersonColor.close;
   end;
+  if Trim(KH.Text) = '力隆' then
+  begin
+    PM.text := '9077#';
+  end;
 end;
 
 procedure TfrmMJManageNewFDNewSF.Button11Click(Sender: TObject);
@@ -3415,7 +3490,7 @@ end;
 
 procedure TfrmMJManageNewFDNewSF.MJLen1Change(Sender: TObject);
 begin
-  if (StrToFloatdef((MJLen1.text), 0) >= 3) and (Edit15.text = '¡Ì') then
+  if (StrToFloatdef((MJLen1.text), 0) >= 10) and (Edit15.text = '√') then
   begin
     S1 := true;
   end;
@@ -3434,5 +3509,79 @@ begin
   end;
 end;
 
+procedure TfrmMJManageNewFDNewSF.Button5Click(Sender: TObject);
+begin
+  MJXH.Text := '1';
+end;
+
+procedure TfrmMJManageNewFDNewSF.GHWCClick(Sender: TObject);
+begin
+  with ADOCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('update WFB_MJJY SET WCfalg=''1''');
+    sql.Add('where isnull(mjstr4,'''')=''' + Trim(MJStr4.text) + '''');
+    execsql;
+  end;
+end;
+
+procedure TfrmMJManageNewFDNewSF.ToolButton1Click(Sender: TObject);
+begin
+  frmClothHCList_WGH := TfrmClothHCList_WGH.create(self);
+  with frmClothHCList_WGH do
+  begin
+    fType := '10';
+    if showmodal = 1 then
+    begin
+
+    end;
+    frmClothHCList_WGH.free;
+  end;
+end;
+
+procedure TfrmMJManageNewFDNewSF.ToolButton5Click(Sender: TObject);
+begin
+  if SelfConnData() = false then
+  begin
+    Application.MessageBox('网络链接失败，请重新保存', '提示', 0);
+    Exit;
+  end;
+end;
+
+function TfrmMJManageNewFDNewSF.SelfConnData(): Boolean;
+begin
+  try
+    with QryCheckNet do
+    begin
+      Close;
+      sql.Clear;
+      //查询一个小表检测网络
+      SQL.Add('select getdate()');
+      Open;
+    end;
+    Result := true;
+  except
+//    if Application.MessageBox('是否重新连接网络！','提示',32+4)<>IDYES then  Exit;
+    if not Assigned(DataLink_TradeManage) then
+      DataLink_TradeManage := TDataLink_TradeManage.Create(Application);
+    try
+      with DataLink_TradeManage.ADOLink do
+      begin
+        //if not Connected then
+        begin
+          Connected := false;
+          ConnectionString := DConString;
+          LoginPrompt := false;
+          Connected := true;
+        end;
+      end;
+      Result := true;
+    except
+      Result := false;
+    end;
+  end;
+end;
+
 end.