1

项目代码/DJ/G01贸易生产计划/U_GetDllForm.pas

@@ -3,8 +3,8 @@ unit U_GetDllForm;
 interface
 
 uses
-  Windows, Messages, forms, OleCtnrs, DateUtils, SysUtils, ADODB, dxCore, cxGridDBTableView,
+  Windows, Messages, forms, OleCtnrs, DateUtils, SysUtils, ADODB, dxCore,
-  ActiveX, IniFiles,System.Threading;
+  cxGridDBTableView, ActiveX, IniFiles, System.Threading;
 
 function GetDllForm(App: Tapplication; FormH: hwnd; FormID: integer; Language: integer; WinStyle: integer; GCode: Pchar; GName: Pchar; DataBase: Pchar; Title: PChar; Parameters1: PChar; Parameters2: PChar; Parameters3: PChar; Parameters4: PChar; Parameters5: PChar; Parameters6: PChar; Parameters7: PChar; Parameters8: PChar; Parameters9: PChar; Parameters10: PChar; DataBaseStr: PChar): hwnd; export; stdcall;
 
@@ -12,11 +12,11 @@ function ConnData(): Boolean;
 
 function GetsysParam1(): Boolean;
 
-
 implementation
 
 uses
-  U_DataLink, U_iniParam,U_globalVar, U_TradePlanList,U_TradePlanMgeList,U_FormLayOutDesign;
+  U_DataLink, U_iniParam, U_globalVar, U_TradePlanList, U_TradePlanMgeList,
+  U_FormLayOutDesign, U_ItemTestList;
 
        /////////////////////////////////////////////////////////////////
       //         功能说明:取Dll中得窗体                              //
@@ -73,14 +73,19 @@ begin
 
   if trim(DataBaseStr) = '' then
   begin
-    server := '101.132.143.144,7781';
+//    server := '101.132.143.144,7781';
    //server:='192.168.110.193,7781';
-    dtbase := 'RTBasicsData';
+//    dtbase := 'RTBasicsData';
 //    dtbase := 'ruifengsyjyData';
   // dtbase:='jingpinjydata' ;
   // dtbase := 'sanhaojydata';
+//    user := 'rtsa';
+//    pswd := 'rightsoft@5740'; //'rightsoft@123';
+
+    server := '101.132.143.144,7781';
+    dtbase := 'jingleijydata';
     user := 'rtsa';
-    pswd :='rightsoft@5740'; //'rightsoft@123';
+    pswd := 'rightsoft@5740';
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
     Parameters1 := '管理';
@@ -111,7 +116,6 @@ begin
        // end)
     //end);
 
-
  // GetsysParam1();
    // 定义窗口类型 、状态
   if WinStyle = 0 then
@@ -156,6 +160,18 @@ begin
           mnewHandle := Handle;
         end;
       end;
+    2:  //Îï²â±¨¸æ
+      begin
+       // Parameters10:='ÐÂÔö';
+        with TfrmItemTestList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10), FormID) do       //
+        begin
+          fFormID := FormID;
+          //FormStyle := mstyle;
+          WindowState := mstate;
+          BorderStyle := mborderstyle;
+          mnewHandle := Handle;
+        end;
+      end;
 //    111:  //生产计划单
 //      begin
 //        with TfrmTradePlanList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),FormID) do       //
@@ -239,10 +255,8 @@ begin
     IniFile.Free;
   end;
 
-
 end;
 
-
 initialization
   CoInitialize(nil);
   dxUnitsLoader.Initialize;

项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm

@@ -8,7 +8,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
   Position = poScreenCenter
   WindowState = wsMaximized
   OnClose = FormClose
-  ExplicitTop = -63
   ExplicitWidth = 1093
   ExplicitHeight = 689
   PixelsPerInch = 96
@@ -71,12 +70,13 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     object Tsj: TToolButton
       Left = 273
       Top = 0
+      AutoSize = True
       Caption = #20445#23384#35774#35745
       ImageIndex = 16
       OnClick = TsjClick
     end
     object TBClose: TToolButton
-      Left = 392
+      Left = 360
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -167,6 +167,14 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       ImageIndex = 49
       OnClick = ToolButton7Click
     end
+    object Timport: TToolButton
+      Left = 744
+      Top = 0
+      AutoSize = True
+      Caption = #23548#20837
+      ImageIndex = 17
+      OnClick = TimportClick
+    end
   end
   object dxPanel1: TdxPanel [3]
     Left = 0
@@ -1022,10 +1030,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object cxTabSheet2: TcxTabSheet
         Caption = #21253#26631#31614
         ImageIndex = 1
-        ExplicitLeft = 0
-        ExplicitTop = 28
-        ExplicitWidth = 200
-        ExplicitHeight = 309
         object RMPreview2: TRMPreview
           Left = 0
           Top = 0
@@ -1042,8 +1046,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
           Options.DrawBorder = False
           Options.BorderPen.Color = clGray
           Options.BorderPen.Style = psDash
-          ExplicitWidth = 200
-          ExplicitHeight = 309
         end
       end
     end
@@ -1055,8 +1057,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     Height = 250
     Align = alBottom
     TabOrder = 3
-    ExplicitLeft = 1
-    ExplicitTop = 399
     object Tv1: TcxGridDBTableView
       PopupMenu = PM_1
       Navigator.Buttons.CustomButtons = <>
@@ -1348,6 +1348,13 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
+      object Tv1BatchNoQty: TcxGridDBColumn
+        Caption = #33853#33394#25968#37327
+        DataBinding.FieldName = 'BatchNoQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -1389,7 +1396,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     Aggregates = <>
     Params = <>
     Left = 539
-    Top = 516
+    Top = 515
   end
   object GPM_1: TcxGridPopupMenu [12]
     Grid = cxGrid1
@@ -1527,4 +1534,10 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       OnClick = MenuItem2Click
     end
   end
+  object CDS_LM: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 560
+    Top = 328
+  end
 end

项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas

@@ -12,13 +12,12 @@ uses
   cxCurrencyEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxDropDownEdit,
   RM_Common, RM_Preview, RM_System, RM_Class, RM_GridReport, RM_Dataset, Menus,
   cxSplitter, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCheckBox,
-   dxDateRanges, dxBarBuiltInMenu, cxPC,
+  dxDateRanges, dxBarBuiltInMenu, cxPC, System.ImageList, Vcl.ImgList,
-  System.ImageList, Vcl.ImgList, U_BaseInput, cxImage, cxDBEdit,
+  U_BaseInput, cxImage, cxDBEdit, IdBaseComponent, Winapi.UrlMon, IdComponent,
-  IdBaseComponent, Winapi.UrlMon,
+  IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI,
-  IdComponent, IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase,
+  dxScrollbarAnnotations, cxGeometry, dxFramedControl, dxLayoutContainer,
-  IdFTP, ShellAPI,  dxScrollbarAnnotations, cxGeometry,
+  dxLayoutControl, dxPanel, cxGroupBox, dxLayoutcxEditAdapters, dxCore, ComObj,
-  dxFramedControl, dxLayoutContainer, dxLayoutControl, dxPanel, cxGroupBox,
+  cxDateUtils, cxImageList;
-  dxLayoutcxEditAdapters, dxCore, cxDateUtils, cxImageList;
 
 type
   TfrmTradePlanInPut = class(TfrmBaseInput)
@@ -159,62 +158,49 @@ type
     Tv1PB_Spec: TcxGridDBColumn;
     Tv1PB_Code: TcxGridDBColumn;
     Tv1DSLight: TcxGridDBColumn;
+    Timport: TToolButton;
+    CDS_LM: TClientDataSet;
+    Tv1BatchNoQty: TcxGridDBColumn;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
-    procedure v1OrderUnitPropertiesButtonClick(Sender: TObject;
+    procedure v1OrderUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
+    procedure v1PriceUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure v1PriceUnitPropertiesButtonClick(Sender: TObject;
-      AButtonIndex: Integer);
     procedure YCLFactoryBtnUpClick(Sender: TObject);
     procedure ScrollBox1Click(Sender: TObject);
     procedure v1Column5PropertiesEditValueChanged(Sender: TObject);
     procedure HYTTBtnUpClick(Sender: TObject);
     procedure KYTTBtnUpClick(Sender: TObject);
     procedure N1Click(Sender: TObject);
-    procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton;
+    procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-      Shift: TShiftState; X, Y: Integer);
     procedure v1OrderUnitPropertiesEditValueChanged(Sender: TObject);
-    procedure Tv1Column4PropertiesButtonClick(Sender: TObject;
+    procedure Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
     procedure cxDBImage1DblClick(Sender: TObject);
     procedure SYRNameBtnUpClick(Sender: TObject);
     procedure N3Click(Sender: TObject);
-    procedure TV2Column5PropertiesButtonClick(Sender: TObject;
+    procedure TV2Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
+    procedure TV2Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure TV2Column1PropertiesButtonClick(Sender: TObject;
-      AButtonIndex: Integer);
     procedure TbcgsClick(Sender: TObject);
     procedure OurCoNameBtnUpClick(Sender: TObject);
     procedure OurCoNameBtnDnClick(Sender: TObject);
-    procedure V2Column1PropertiesButtonClick(Sender: TObject;
+    procedure V2Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
     procedure ToolButton5Click(Sender: TObject);
     procedure C_CodeBtnDnClick(Sender: TObject);
-    procedure CustomerNoNamePropertiesButtonClick(Sender: TObject;
+    procedure CustomerNoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
     procedure FormCreate(Sender: TObject);
-    procedure v1PRTCodeNamePropertiesButtonClick(Sender: TObject;
+    procedure v1PRTCodeNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
+    procedure v1C_ColorPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure v1C_ColorPropertiesButtonClick(Sender: TObject;
+    procedure GildingPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
+    procedure FtyNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure GildingPropertiesButtonClick(Sender: TObject;
+    procedure v1OrdUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
-    procedure FtyNamePropertiesButtonClick(Sender: TObject;
-      AButtonIndex: Integer);
-    procedure v1OrdUnitPropertiesButtonClick(Sender: TObject;
-      AButtonIndex: Integer);
     procedure TsjClick(Sender: TObject);
-    procedure LabVolumePropertiesButtonClick(Sender: TObject;
+    procedure LabVolumePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
     procedure LabVolumeEnter(Sender: TObject);
     procedure LabPackageEnter(Sender: TObject);
-    procedure Tv1SLabVolumePropertiesButtonClick(Sender: TObject;
+    procedure Tv1SLabVolumePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
+    procedure Tv1SLabPackagePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure Tv1SLabPackagePropertiesButtonClick(Sender: TObject;
-      AButtonIndex: Integer);
     procedure ToolButton3Click(Sender: TObject);
     procedure TupimageClick(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -224,11 +210,10 @@ type
     procedure MenuItem2Click(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
     procedure ToolButton7Click(Sender: TObject);
-    procedure v1AttNamePropertiesButtonClick(Sender: TObject;
+    procedure v1AttNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
+    procedure ButtonEdit(Sender: TObject; AButtonIndex: Integer);
-    procedure ButtonEdit(Sender: TObject;
-      AButtonIndex: Integer);
     procedure ToolButton8Click(Sender: TObject);
+    procedure TimportClick(Sender: TObject);
   private
     fIsLabelSave: Boolean;
     FSCXDH: string;
@@ -263,8 +248,8 @@ implementation
 
 uses
   U_DataLink, U_TradeInspSet, U_ZDYHelp, U_RTFun, U_CompanySel,
-  U_FormLayOutDesign,U_cxGridCustomSet, U_PictureUpload,
+  U_FormLayOutDesign, U_cxGridCustomSet, U_PictureUpload, U_ClothInfoSel,
-  U_ClothInfoSel, U_globalVar, U_UptPlanDataToRoll;
+  U_globalVar, U_UptPlanDataToRoll;
 // getpic     ,
 
 {$R *.dfm}
@@ -279,8 +264,7 @@ begin
   begin
     close;
     sql.Clear;
-    sql.Add('select MainID from Trade_Plan_Main where orderNo=' +
+    sql.Add('select MainID from Trade_Plan_Main where orderNo=' + quotedstr(trim(str1)));
-      quotedstr(trim(str1)));
     open;
   end;
   if not ADOTemp.IsEmpty then
@@ -292,8 +276,7 @@ begin
       begin
         close;
         sql.Clear;
-        sql.Add('select MainID from Trade_Plan_Main where orderNo=' +
+        sql.Add('select MainID from Trade_Plan_Main where orderNo=' + quotedstr(trim(str1)));
-          quotedstr(trim(str1)));
         open;
       end;
       if ADOCmd.IsEmpty then
@@ -303,8 +286,7 @@ begin
   result := str1;
 end;
 
-procedure TfrmTradePlanInPut.GildingPropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.GildingPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 var
   fsj: string;
   FWZ: Integer;
@@ -320,8 +302,7 @@ begin
 
       if ShowModal = 1 then
       begin
-        TcxButtonEdit(Sender).Text :=
+        TcxButtonEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
       end;
     end;
   finally
@@ -358,8 +339,7 @@ begin
   LSCSHData(ADOTemp, dxLayoutControl_bzplan, 2);
 
   // OurCoName.TxtCode := Trim(ADOTemp.FieldByName('OurCoNo').AsString);
-  CustName.Properties.LookupItems.Text :=
+  CustName.Properties.LookupItems.Text := trim(ADOTemp.fieldbyname('CustNo').AsString);
-    trim(ADOTemp.fieldbyname('CustNo').AsString);
   LabVolume.Text := trim(ADOTemp.fieldbyname('LabVolume').AsString);
   LabPackage.Text := trim(ADOTemp.fieldbyname('LabPackage').AsString);
 
@@ -457,11 +437,10 @@ var
 begin
 end;
 
-procedure TfrmTradePlanInPut.FormClose(Sender: TObject;
+procedure TfrmTradePlanInPut.FormClose(Sender: TObject; var Action: TCloseAction);
-  var Action: TCloseAction);
 begin
   inherited;
-  action:=cafree;
+  Action := cafree;
 end;
 
 procedure TfrmTradePlanInPut.FormCreate(Sender: TObject);
@@ -511,14 +490,20 @@ begin
   thread.FreeOnTerminate := True;
   thread.Start;
   application.ProcessMessages;
+  with CDS_LM do
+  begin
+    FieldDefs.Clear;
+    FieldDefs.Add('LXH', ftInteger, 0);
+    FieldDefs.Add('lCode', ftString, 40);
+    FieldDefs.Add('LName', ftString, 40);
+    close;
+    CreateDataSet;
+  end;
   InitData();
 
-
-
 end;
 
-procedure TfrmTradePlanInPut.FtyNamePropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.FtyNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 var
   fsj: string;
   FWZ: Integer;
@@ -534,8 +519,7 @@ begin
       MainType := TEdit(Sender).Name;
       if ShowModal = 1 then
       begin
-        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName')
+        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          .AsString);
       end;
     end;
   finally
@@ -567,8 +551,7 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('select * from Trade_Plan_Main where MainId=''' +
+      sql.Add('select * from Trade_Plan_Main where MainId=''' + trim(FMainId) + '''');
-        trim(FMainId) + '''');
       open;
     end;
     with ADOCmd do
@@ -612,8 +595,7 @@ begin
         begin
           close;
           sql.Clear;
-          sql.Add('select * from Trade_Plan_Sub where MainId=''' +
+          sql.Add('select * from Trade_Plan_Sub where MainId=''' + trim(maxno) + '''');
-            trim(maxno) + '''');
           sql.Add(' and SubId=''' + trim(Smaxno) + '''');
           open;
         end;
@@ -630,10 +612,8 @@ begin
           RTSetSaveDataCDS(ADOCmd, Tv1, CDS_1, 'Trade_Plan_Sub', 9);
           LRTSetsavedata(ADOCmd, 'Trade_Plan_Sub', dxLayoutControl_bzplan, 7);
           fieldbyname('MainId').Value := trim(maxno);
-          fieldbyname('ConSId').Value :=
+          fieldbyname('ConSId').Value := trim(CDS_1.fieldbyname('ConSId').AsString);
-            trim(CDS_1.fieldbyname('ConSId').AsString);
+          fieldbyname('ConMId').Value := trim(CDS_1.fieldbyname('ConMId').AsString);
-          fieldbyname('ConMId').Value :=
-            trim(CDS_1.fieldbyname('ConMId').AsString);
 
           Post;
 //          with CDS_1 do
@@ -659,16 +639,14 @@ begin
         begin
           close;
           sql.Clear;
-          sql.Add('select * from Trade_Plan_Fty where MainId=''' +
+          sql.Add('select * from Trade_Plan_Fty where MainId=''' + trim(maxno) + '''');
-            trim(maxno) + '''');
           open;
         end;
         with ADOCmd do
         begin
           if IsEmpty then
           begin
-            if GetLSNo(ADOQueryBaseCmd, MaxFNo, 'JF', 'Trade_Plan_Fty', 4, 1) = false
+            if GetLSNo(ADOQueryBaseCmd, MaxFNo, 'JF', 'Trade_Plan_Fty', 4, 1) = false then
-            then
               raise Exception.Create('取子流水号失败!');
             Append;
             fieldbyname('MainId').Value := trim(maxno);
@@ -678,8 +656,7 @@ begin
             Edit;
 
           fieldbyname('ftyName').Value := trim(factoryName.Text);
-          fieldbyname('ftyNo').Value :=
+          fieldbyname('ftyNo').Value := trim(factoryName.Properties.LookupItems.Text);
-            trim(factoryName.Properties.LookupItems.Text);
           // RTSetSaveDataCDS(ADOCmd, Tv2, CDS_Fact, 'Trade_Plan_Fty', 0);
           Post;
           with CDS_Fact do
@@ -699,8 +676,7 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('select * from Trade_Plan_Main where orderno=''' +
+      sql.Add('select * from Trade_Plan_Main where orderno=''' + trim(OrderNo.Text) + '''');
-        trim(OrderNo.Text) + '''');
       open;
     end;
     if ADOCmd.RecordCount > 1 then
@@ -711,8 +687,7 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('update Trade_Plan_Main SET status=''9'',chker=''' + trim(DName) +
+      sql.Add('update Trade_Plan_Main SET status=''9'',chker=''' + trim(DName) + ''',Chktime=getdate() ');
-        ''',Chktime=getdate() ');
       sql.Add('where mainId=' + quotedstr(maxno));
       sql.Add('and status<''9''');
       execsql;
@@ -758,20 +733,106 @@ begin
     exit;
   end;
 
-  if not checkColumnMustIn(application,tv1,9) then exit;
+  if not checkColumnMustIn(application, tv1, 9) then
-
+    exit;
 
   if SaveData() then
   begin
     initGrid();
     if not fIsLabelSave then
       Application.MessageBox('保存成功！', '提示', 0);
-    if PState=0 then PState:=1;
+    if PState = 0 then
+      PState := 1;
 
     ModalResult := 1;
   end;
 end;
 
+procedure TfrmTradePlanInPut.TimportClick(Sender: TObject);
+var
+  excelApp, WorkBook: Variant;
+  i, j, k, LX, ExcelRowCount: integer;
+  maxId, FCPID, FCPName, t1, t2, t3, FFID: string;
+begin
+  inherited;
+  try
+    excelApp := CreateOleObject('Excel.Application');
+    openDialog1.Filter := '*.CSV;*.xls';
+    if opendialog1.Execute then
+    begin
+      WorkBook := excelApp.WorkBooks.Open(OpenDialog1.FileName);
+    end
+    else
+      exit;
+    excelApp.Visible := false;
+    ExcelRowCount := WorkBook.WorkSheets[1].UsedRange.Rows.Count;
+  except
+    application.MessageBox('加载EXCEL错误！', '错误信息', MB_ICONERROR);
+    exit;
+  end;
+
+  CDS_LM.EmptyDataSet;
+
+  for j := 0 to Tv1.ColumnCount - 1 do
+  begin
+    with CDS_LM do
+    begin
+      Append;
+      FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName);
+      FieldByName('LName').Value := trim(Tv1.Columns[j].Caption);
+      Post;
+    end;
+  end;
+
+  try
+    for i := 1 to 50 do
+    begin
+      if trim(WorkBook.WorkSheets[1].Cells[1, i].value) = '' then
+        continue;
+      if CDS_LM.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[1, i].value), []) then
+      begin
+        with CDS_LM do
+        begin
+          Edit;
+          FieldByName('LXH').Value := i;
+          Post;
+        end;
+      end;
+    end;
+  except
+    application.MessageBox('加载数组错误！', '错误信息', MB_ICONERROR);
+    exit;
+  end;
+
+  try
+    for i := 2 to ExcelRowCount do
+    begin
+      with CDS_1 do
+      begin
+        Append;
+        CDS_LM.First;
+        while not CDS_LM.Eof do
+        begin
+          if CDS_LM.FieldByName('LXH').AsInteger > 0 then
+            CDS_1.fieldbyname(CDS_LM.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_LM.FieldByName('LXH').AsInteger].Value;
+          CDS_LM.Next;
+        end;
+        Post;
+      end;
+    end;
+    WorkBook.Close;
+    excelApp.Quit;
+    excelApp := Unassigned;
+    WorkBook := Unassigned;
+  except
+    WorkBook.Close;
+    excelApp.Quit;
+    excelApp := Unassigned;
+    WorkBook := Unassigned;
+    exit;
+  end;
+end;
+
 procedure TfrmTradePlanInPut.ToolButton1Click(Sender: TObject);
 var
   i: Integer;
@@ -822,8 +883,7 @@ begin
         begin
           close;
           sql.Clear;
-        sql.Add('select * from Trade_Cloth_Inspect where isnull(SubId,'''')<>'''' and SubId='''
+          sql.Add('select * from Trade_Cloth_Inspect where isnull(SubId,'''')<>'''' and SubId=''' + trim(CDS_1.fieldbyname('SubId').AsString) + '''');
-          + trim(CDS_1.fieldbyname('SubId').AsString) + '''');
           open;
         end;
         if ADOTemp.IsEmpty = false then
@@ -840,8 +900,7 @@ begin
 
           // sql.Add('insert into Trade_Plan_Sub_Del select * from Trade_Plan_Sub where SubId=''' + Trim(CDS_1.fieldbyname('SubId').AsString) + '''');
 
-          sql.Add('delete Trade_Plan_Sub where SubId=''' +
+            sql.Add('delete Trade_Plan_Sub where SubId=''' + trim(CDS_1.fieldbyname('SubId').AsString) + '''');
-            trim(CDS_1.fieldbyname('SubId').AsString) + '''');
 
             execsql;
           end;
@@ -853,7 +912,6 @@ begin
     CDS_1.EnableControls;
   end;
 
-
 end;
 
 procedure TfrmTradePlanInPut.ToolButton3Click(Sender: TObject);
@@ -883,7 +941,8 @@ begin
   end;
 
   fieldName := tv1.Columns[col + 1].DataBinding.FieldName;
-  if fieldName='' then exit;
+  if fieldName = '' then
+    exit;
 
   if InputQuery('', '前缀字符:', strResult) then
   begin
@@ -916,8 +975,7 @@ begin
       begin
         while CDS_1.Locate('SSel', True, []) do
         begin
-          if SELF.CDS_1.Locate('ConSubId',
+          if SELF.CDS_1.Locate('ConSubId', trim(CDS_1.fieldbyname('SubId').AsString), []) then
-            trim(CDS_1.fieldbyname('SubId').AsString), []) then
           begin
             CDS_1.Edit;
             CDS_1.fieldbyname('SSel').Value := false;
@@ -927,32 +985,22 @@ begin
           begin
             Append;
             fieldbyname('SSel').Value := false;
-            C_Code.Text := trim(frmClothInfoSel.CDS_1.fieldbyname('C_Code')
+            C_Code.Text := trim(frmClothInfoSel.CDS_1.fieldbyname('C_Code').AsString);
-              .AsString);
+            C_Name.Text := trim(frmClothInfoSel.CDS_1.fieldbyname('C_Name').AsString);
-            C_Name.Text := trim(frmClothInfoSel.CDS_1.fieldbyname('C_Name')
-              .AsString);
             // C_Spec.Text := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Spec').AsString);
             // C_Composition.Text := trim(frmClothInfoSel.CDS_1.Fieldbyname('C_Composition').AsString);
-            C_Width.Text := trim(frmClothInfoSel.CDS_1.fieldbyname('C_Width')
+            C_Width.Text := trim(frmClothInfoSel.CDS_1.fieldbyname('C_Width').AsString);
-              .AsString);
+            C_GramWeight.Text := trim(frmClothInfoSel.CDS_1.fieldbyname('C_GramWeight').AsString);
-            C_GramWeight.Text :=
-              trim(frmClothInfoSel.CDS_1.fieldbyname('C_GramWeight').AsString);
             // OrdUnit.ItemIndex := OrdUnit.Items.IndexOf(trim(frmClothInfoSel.CDS_1.fieldbyname('ConUnit').AsString));
 
-            fieldbyname('C_ColorNo').Value :=
+            fieldbyname('C_ColorNo').Value := trim(frmClothInfoSel.CDS_1.fieldbyname('C_ColorNo').AsString);
-              trim(frmClothInfoSel.CDS_1.fieldbyname('C_ColorNo').AsString);
+            fieldbyname('C_Color').Value := trim(frmClothInfoSel.CDS_1.fieldbyname('C_Color').AsString);
-            fieldbyname('C_Color').Value :=
+            fieldbyname('C_Pattern').Value := trim(frmClothInfoSel.CDS_1.fieldbyname('C_Pattern').AsString);
-              trim(frmClothInfoSel.CDS_1.fieldbyname('C_Color').AsString);
-            fieldbyname('C_Pattern').Value :=
-              trim(frmClothInfoSel.CDS_1.fieldbyname('C_Pattern').AsString);
 
-            fieldbyname('OrdQty').Value := frmClothInfoSel.CDS_1.fieldbyname
+            fieldbyname('OrdQty').Value := frmClothInfoSel.CDS_1.fieldbyname('ConQty').AsFloat;
-              ('ConQty').AsFloat;
 
-            fieldbyname('DDQtyUnit').Value := frmClothInfoSel.CDS_1.fieldbyname
+            fieldbyname('DDQtyUnit').Value := frmClothInfoSel.CDS_1.fieldbyname('SCSUnit').AsString;
-              ('SCSUnit').AsString;
+            fieldbyname('OrderUnit').Value := trim(frmClothInfoSel.CDS_1.fieldbyname('SCSUnit').AsString);
-            fieldbyname('OrderUnit').Value :=
-              trim(frmClothInfoSel.CDS_1.fieldbyname('SCSUnit').AsString);
 
           end;
           CDS_1.Edit;
@@ -1035,7 +1083,8 @@ begin
   end;
 
   fieldName := tv1.Columns[col + 1].DataBinding.FieldName;
-  if fieldName='' then exit;
+  if fieldName = '' then
+    exit;
 
   if InputQuery('', '前缀字符:', strResult) then
   begin
@@ -1060,13 +1109,15 @@ begin
   end;
   try
     frmPictureUpload := TfrmPictureUpload.Create(Application);
-    with frmPictureUpload do begin
+    with frmPictureUpload do
+    begin
       fFlileFlag := self.fFlileFlag;
       FWidth := 250;
       FHeight := 300;
       FTFType := 'HX';
       FDataId := Trim(FMainId);
-      if ShowModal = 1 then begin
+      if ShowModal = 1 then
+      begin
         InitData();
       end;
     end;
@@ -1078,8 +1129,7 @@ end;
 
 procedure TfrmTradePlanInPut.TsjClick(Sender: TObject);
 begin
-  saveLayOut(application,dxLayoutControl_bzplan, ADOQueryBaseCmd,
+  saveLayOut(application, dxLayoutControl_bzplan, ADOQueryBaseCmd, PWideChar(fDllFileName + '|' + SELF.Name + '|' + dxLayoutControl_bzplan.Name + '.ini'));
-   PWideChar( fDllFileName + '|' + SELF.Name + '|' + dxLayoutControl_bzplan.Name+ '.ini'));
 
 end;
 
@@ -1094,13 +1144,15 @@ begin
   end;
   try
     frmPictureUpload := TfrmPictureUpload.Create(Application);
-    with frmPictureUpload do begin
+    with frmPictureUpload do
+    begin
       fFlileFlag := self.fFlileFlag;
       FWidth := 250;
       FHeight := 300;
       FTFType := 'HX';
       FDataId := Trim(Self.CDS_1.fieldbyname('subId').AsString);
-      if ShowModal = 1 then begin
+      if ShowModal = 1 then
+      begin
         InitData();
       end;
     end;
@@ -1110,8 +1162,7 @@ begin
 
 end;
 
-procedure TfrmTradePlanInPut.CustomerNoNamePropertiesButtonClick
+procedure TfrmTradePlanInPut.CustomerNoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  (Sender: TObject; AButtonIndex: Integer);
 begin
 //  try
 //    frmCompanySel := TfrmCompanySel.Create(Application);
@@ -1162,8 +1213,7 @@ begin
   cxPageControl1.ActivePageIndex := 0;
 end;
 
-procedure TfrmTradePlanInPut.LabVolumePropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.LabVolumePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   try
     fIsLabelSave := True;
@@ -1207,8 +1257,7 @@ begin
   sFieldName := sFieldName + '\' + trim(FileName);
 
   try
-    IdFTP1.Host := ReadINIFileStr('SYSTEMSET.INI', 'SERVER', '·þÎñÆ÷µØÖ·',
+    IdFTP1.Host := ReadINIFileStr('SYSTEMSET.INI', 'SERVER', '服务器地址', '127.0.0.1');
-      '127.0.0.1');
     IdFTP1.Username := 'three';
     IdFTP1.Password := '641010';
     IdFTP1.Connect();
@@ -1247,13 +1296,11 @@ begin
   SelOKNo(CDS_1, False);
 end;
 
-procedure TfrmTradePlanInPut.v1OrderUnitPropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.v1OrderUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 var
   mvalues: string;
 begin
-  mvalues := Tv1.Columns[Tv1.Controller.FocusedColumn.index]
+  mvalues := Tv1.Columns[Tv1.Controller.FocusedColumn.index].DataBinding.FieldName;
-    .DataBinding.FieldName;
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
     with frmZDYHelp do
@@ -1263,8 +1310,7 @@ begin
       if ShowModal = 1 then
       begin
         SELF.CDS_1.Edit;
-        SELF.CDS_1.fieldbyname(mvalues).Value :=
+        SELF.CDS_1.fieldbyname(mvalues).Value := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
       end;
     end;
   finally
@@ -1272,8 +1318,7 @@ begin
   end;
 end;
 
-procedure TfrmTradePlanInPut.v1OrderUnitPropertiesEditValueChanged
+procedure TfrmTradePlanInPut.v1OrderUnitPropertiesEditValueChanged(Sender: TObject);
-  (Sender: TObject);
 var
   mvalue, FFieldName, YValue: string;
   FDDQty, FCPCDXS, FQty, FDKCQty: Double;
@@ -1349,8 +1394,7 @@ begin
   Tv1.Controller.EditingController.ShowEdit();
 end;
 
-procedure TfrmTradePlanInPut.v1OrdUnitPropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.v1OrdUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
@@ -1361,8 +1405,7 @@ begin
       if ShowModal = 1 then
       begin
         SELF.CDS_1.Edit;
-        SELF.CDS_1.fieldbyname('OrdUnit').Value :=
+        SELF.CDS_1.fieldbyname('OrdUnit').Value := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
       end;
     end;
   finally
@@ -1371,8 +1414,7 @@ begin
 
 end;
 
-procedure TfrmTradePlanInPut.v1PriceUnitPropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.v1PriceUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
@@ -1390,8 +1432,7 @@ begin
       if ShowModal = 1 then
       begin
         SELF.CDS_1.Edit;
-        SELF.CDS_1.fieldbyname('PriceUnit').Value :=
+        SELF.CDS_1.fieldbyname('PriceUnit').Value := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
       end;
     end;
   finally
@@ -1399,8 +1440,7 @@ begin
   end;
 end;
 
-procedure TfrmTradePlanInPut.v1PRTCodeNamePropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.v1PRTCodeNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   inherited;
   try
@@ -1412,10 +1452,8 @@ begin
       if ShowModal = 1 then
       begin
         SELF.CDS_1.Edit;
-        SELF.CDS_1.fieldbyname('c_code').Value :=
+        SELF.CDS_1.fieldbyname('c_code').Value := trim(ClientDataSet1.fieldbyname('ZDYNo').AsString);
-          trim(ClientDataSet1.fieldbyname('ZDYNo').AsString);
+        SELF.CDS_1.fieldbyname('c_name').Value := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-        SELF.CDS_1.fieldbyname('c_name').Value :=
-          trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
       end;
     end;
   finally
@@ -1438,8 +1476,7 @@ begin
       flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
       if ShowModal = 1 then
       begin
-        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName')
+        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          .AsString);
       end;
     end;
   finally
@@ -1460,8 +1497,7 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('delete Trade_Plan_Fty where TPFId=''' +
+      sql.Add('delete Trade_Plan_Fty where TPFId=''' + trim(CDS_Fact.fieldbyname('TPFId').AsString) + '''');
-        trim(CDS_Fact.fieldbyname('TPFId').AsString) + '''');
       execsql;
     end;
   end;
@@ -1529,8 +1565,7 @@ begin
       flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
       if ShowModal = 1 then
       begin
-        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName')
+        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          .AsString);
       end;
     end;
   finally
@@ -1538,8 +1573,7 @@ begin
   end;
 end;
 
-procedure TfrmTradePlanInPut.Tv1Column4PropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   frmClothInfoSel := TfrmClothInfoSel.Create(SELF);
   with frmClothInfoSel do
@@ -1548,18 +1582,14 @@ begin
     begin
       CDS_1.Edit;
       CDS_1.fieldbyname('MPRTCode').Value := CDS_1.fieldbyname('CYNO').AsString;
-      CDS_1.fieldbyname('MPRTCodeName').Value :=
+      CDS_1.fieldbyname('MPRTCodeName').Value := CDS_1.fieldbyname('CYName').AsString;
-        CDS_1.fieldbyname('CYName').AsString;
+      CDS_1.fieldbyname('MPRTSpec').Value := CDS_1.fieldbyname('CYSpec').AsString;
-      CDS_1.fieldbyname('MPRTSpec').Value :=
-        CDS_1.fieldbyname('CYSpec').AsString;
       CDS_1.fieldbyname('MPRTCF').Value := CDS_1.fieldbyname('CYCF').AsString;
-      CDS_1.fieldbyname('PRTColor').Value :=
+      CDS_1.fieldbyname('PRTColor').Value := CDS_1.fieldbyname('CYColor').AsString;
-        CDS_1.fieldbyname('CYColor').AsString;
       CDS_1.fieldbyname('PRTHX').Value := CDS_1.fieldbyname('CYHX').AsString;
       CDS_1.fieldbyname('MPRTMF').Value := CDS_1.fieldbyname('CYMF').AsString;
       CDS_1.fieldbyname('MPRTKZ').Value := CDS_1.fieldbyname('CYKZ').AsString;
-      CDS_1.fieldbyname('OrderUnit').Value :=
+      CDS_1.fieldbyname('OrderUnit').Value := CDS_1.fieldbyname('CYPUnit').AsString;
-        CDS_1.fieldbyname('CYPUnit').AsString;
       CDS_1.fieldbyname('SuoLv').Value := CDS_1.fieldbyname('SuoLv').AsString;
       CDS_1.fieldbyname('GcHuaNo').Value := CDS_1.fieldbyname('GcHua').AsString;
       CDS_1.fieldbyname('GsHuaNo').Value := CDS_1.fieldbyname('GsHua').AsString;
@@ -1569,15 +1599,13 @@ begin
   end;
 end;
 
-procedure TfrmTradePlanInPut.Tv1MouseDown(Sender: TObject; Button: TMouseButton;
+procedure TfrmTradePlanInPut.Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-  Shift: TShiftState; X, Y: Integer);
 begin
 
   // InitImageHX();
 end;
 
-procedure TfrmTradePlanInPut.Tv1SLabPackagePropertiesButtonClick(
+procedure TfrmTradePlanInPut.Tv1SLabPackagePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  Sender: TObject; AButtonIndex: Integer);
 begin
   inherited;
   try
@@ -1590,8 +1618,7 @@ begin
       if ShowModal = 1 then
       begin
         SELF.CDS_1.Edit;
-        SELF.CDS_1.fieldbyname('SLabPackage').Value :=
+        SELF.CDS_1.fieldbyname('SLabPackage').Value := trim(CDS_Label.fieldbyname('labelCaption').AsString);
-          trim(CDS_Label.fieldbyname('labelCaption').AsString);
        // getLabel();
 
       end;
@@ -1602,8 +1629,7 @@ begin
   end;
 end;
 
-procedure TfrmTradePlanInPut.Tv1SLabVolumePropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.Tv1SLabVolumePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   inherited;
   try
@@ -1616,8 +1642,7 @@ begin
       if ShowModal = 1 then
       begin
         SELF.CDS_1.Edit;
-        SELF.CDS_1.fieldbyname('SLabVolume').Value :=
+        SELF.CDS_1.fieldbyname('SLabVolume').Value := trim(CDS_Label.fieldbyname('labelCaption').AsString);
-          trim(CDS_Label.fieldbyname('labelCaption').AsString);
        // getLabel();
 
       end;
@@ -1628,8 +1653,7 @@ begin
   end;
 end;
 
-procedure TfrmTradePlanInPut.TV2Column1PropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.TV2Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
@@ -1641,8 +1665,7 @@ begin
       if ShowModal = 1 then
       begin
         CDS_Fact.Edit;
-        CDS_Fact.fieldbyname('Technics').Value :=
+        CDS_Fact.fieldbyname('Technics').Value := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
 
       end;
     end;
@@ -1652,8 +1675,7 @@ begin
 
 end;
 
-procedure TfrmTradePlanInPut.TV2Column5PropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.TV2Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
@@ -1665,8 +1687,7 @@ begin
       if ShowModal = 1 then
       begin
         CDS_Fact.Edit;
-        CDS_Fact.fieldbyname('SJGDY').Value :=
+        CDS_Fact.fieldbyname('SJGDY').Value := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
 
       end;
     end;
@@ -1675,8 +1696,7 @@ begin
   end;
 end;
 
-procedure TfrmTradePlanInPut.V2Column1PropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.V2Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   try
     frmCompanySel := TfrmCompanySel.Create(Application);
@@ -1687,10 +1707,8 @@ begin
       begin
         CDS_Fact.Edit;
 
-        CDS_Fact.fieldbyname('FtyNo').Value :=
+        CDS_Fact.fieldbyname('FtyNo').Value := trim(CDS_1.fieldbyname('CoCode').AsString);
-          trim(CDS_1.fieldbyname('CoCode').AsString);
+        CDS_Fact.fieldbyname('FtyName').Value := trim(CDS_1.fieldbyname('CoAbbrName').AsString);
-        CDS_Fact.fieldbyname('FtyName').Value :=
-          trim(CDS_1.fieldbyname('CoAbbrName').AsString);
       end;
     end;
   finally
@@ -1699,15 +1717,13 @@ begin
 
 end;
 
-procedure TfrmTradePlanInPut.v1AttNamePropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.v1AttNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   inherited;
   Tupimage.Click;
 end;
 
-procedure TfrmTradePlanInPut.v1Column5PropertiesEditValueChanged
+procedure TfrmTradePlanInPut.v1Column5PropertiesEditValueChanged(Sender: TObject);
-  (Sender: TObject);
 var
   mvalue, FFieldName: string;
 begin
@@ -1724,8 +1740,7 @@ begin
   Tv1.Controller.EditingController.ShowEdit();
 end;
 
-procedure TfrmTradePlanInPut.v1C_ColorPropertiesButtonClick(Sender: TObject;
+procedure TfrmTradePlanInPut.v1C_ColorPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
@@ -1739,10 +1754,8 @@ begin
       if ShowModal = 1 then
       begin
         SELF.CDS_1.Edit;
-        SELF.CDS_1.fieldbyname('c_color').Value :=
+        SELF.CDS_1.fieldbyname('c_color').Value := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+        SELF.CDS_1.fieldbyname('c_ecolor').Value := trim(ClientDataSet1.fieldbyname('Note').AsString);
-        SELF.CDS_1.fieldbyname('c_ecolor').Value :=
-          trim(ClientDataSet1.fieldbyname('Note').AsString);
       end;
     end;
   finally
@@ -1750,8 +1763,7 @@ begin
   end;
 end;
 
-procedure TfrmTradePlanInPut.ButtonEdit(Sender: TObject;
+procedure TfrmTradePlanInPut.ButtonEdit(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   inherited;
   Tupimage.Click;
@@ -1772,8 +1784,7 @@ begin
       flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
       if ShowModal = 1 then
       begin
-        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName')
+        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          .AsString);
       end;
     end;
   finally
@@ -1802,8 +1813,7 @@ begin
       end;
       if ShowModal = 1 then
       begin
-        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName')
+        TEdit(Sender).Text := trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-          .AsString);
 
       end;
     end;
@@ -1849,14 +1859,14 @@ begin
       sql.clear;
       sql.Add('select * from Trade_Cloth_Inspect_Rule where RuleID=''' + trim(fCopyMainId) + '''');
       open;
-      if IsEmpty then exit;
+      if IsEmpty then
+        exit;
     end;
     with ADOQueryBaseCmd do
     begin
       close;
       sql.Clear;
-      sql.Add('select * from Trade_Cloth_Inspect_Rule where RuleID=''' +
+      sql.Add('select * from Trade_Cloth_Inspect_Rule where RuleID=''' + trim(mPlanId) + '''');
-        trim(mPlanId) + '''');
       open;
     end;
     with ADOQueryBaseCmd do
@@ -1874,7 +1884,7 @@ begin
       //////////////
       for i := 0 to ADOQueryBaseTemp.Fields.Count - 1 do
       begin
-        if (lowercase(ADOQueryBaseTemp.Fields[i].FieldName)<>'ruleid') then
+        if (lowercase(ADOQueryBaseTemp.Fields[i].fieldName) <> 'ruleid') then
         begin
           fields[i].Value := ADOQueryBaseTemp.Fields[i].Value;
         end;
@@ -1896,7 +1906,7 @@ end;
 
 function TfrmTradePlanInPut.getLabel(labelType: string = ''): Boolean;
 var
-  mLblFile:String;
+  mLblFile: string;
 begin
   if TRIM(LabVolume.Text) <> '' then
   begin
@@ -1933,7 +1943,6 @@ begin
     RMGridReport2.Clear;
   end;
 
-
 end;
 
 //**
@@ -1989,11 +1998,9 @@ end;
 
 ////////////////////////////////////////////////
 procedure TfrmTradePlanInPut.threadLoadform();
-
 begin
 
-
-
 end;
 
 end.
+

项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.pas

@@ -4,19 +4,17 @@ interface
 
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
-  System.Classes, Vcl.Graphics,
+  System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, cxGraphics,
+  Vcl.ComCtrls, Vcl.ToolWin, cxGraphics, cxControls, cxLookAndFeels, cxContainer,
-  cxControls, cxLookAndFeels,
+  cxEdit, dxLayoutcxEditAdapters, dxBarBuiltInMenu, cxPC, dxLayoutContainer,
-  cxContainer, cxEdit, dxLayoutcxEditAdapters, dxBarBuiltInMenu, cxPC,
+  cxClasses, cxTextEdit, dxLayoutControl, cxStyles, cxCustomData, cxFilter,
-  dxLayoutContainer, cxClasses, cxTextEdit, dxLayoutControl, cxStyles,
+  cxData, cxDataStorage, cxNavigator, dxDateRanges, dxScrollbarAnnotations,
-  cxCustomData, cxFilter, cxData, cxDataStorage, cxNavigator, dxDateRanges,
+  Data.DB, cxDBData, cxCalendar, cxGridLevel, cxGridCustomTableView,
-  dxScrollbarAnnotations, Data.DB, cxDBData, cxCalendar, cxGridLevel,
+  cxGridTableView, cxGridDBTableView, cxGridCustomView, cxGrid, U_BaseList,
-  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridCustomView,
+  Data.Win.ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, Datasnap.DBClient,
-  cxGrid, U_BaseList, Data.Win.ADODB, cxGridCustomPopupMenu, cxGridPopupMenu,
+  cxCheckBox, cxButtonEdit, cxSplitter, dxCore, cxDateUtils, cxMaskEdit,
-  Datasnap.DBClient, cxCheckBox, cxButtonEdit, cxSplitter, dxCore, cxDateUtils,
+  cxDropDownEdit, cxProgressBar, Vcl.Menus, RM_Common, RM_Class, RM_GridReport,
-  cxMaskEdit, cxDropDownEdit,  cxProgressBar, Vcl.Menus,
+  RM_Dataset, cxLookAndFeelPainters, Vcl.ExtCtrls;
-  RM_Common, RM_Class, RM_GridReport, RM_Dataset, cxLookAndFeelPainters,
-  Vcl.ExtCtrls;
 
 type
   TfrmTradePlanMgeList = class(TfrmBaseList)
@@ -217,9 +215,7 @@ type
     procedure FormDestroy(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView;
+    procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
-      APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord;
-      ANewItemRecordFocusingChanged: Boolean);
     procedure TBAddClick(Sender: TObject);
     procedure cxTabControl1Change(Sender: TObject);
     procedure TbcgsClick(Sender: TObject);
@@ -241,8 +237,7 @@ type
     procedure N1Click(Sender: TObject);
     procedure N2Click(Sender: TObject);
     procedure TupdatetoClick(Sender: TObject);
-    procedure ButtonEdit(Sender: TObject;
+    procedure ButtonEdit(Sender: TObject; AButtonIndex: Integer);
-      AButtonIndex: Integer);
   private
     canshu1, canshu2: string;
     fIsLoad: Boolean;
@@ -254,7 +249,6 @@ type
     function DelSubData(): Boolean;
     procedure threadLoadform();
   public
-
   end;
 
 var
@@ -277,12 +271,15 @@ begin
 
     try
       frmTradePlanInPut := TfrmTradePlanInPut.Create(Application);
-        with frmTradePlanInPut do begin PState := 1;
+      with frmTradePlanInPut do
+      begin
+        PState := 1;
         CopyInt := 99;
         FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString);
         fCopyMainId := FMainId;
         canshu1 := Self.canshu1;
-        if ShowModal = 1 then begin
+        if ShowModal = 1 then
+        begin
 
         end;
       end;
@@ -297,12 +294,15 @@ begin
 
     try
       frmTradePlanInPut := TfrmTradePlanInPut.Create(Application);
-        with frmTradePlanInPut do begin PState := 1;
+      with frmTradePlanInPut do
+      begin
+        PState := 1;
         CopyInt := 99;
         FMainId := Trim(Self.cds_mxlist.fieldbyname('MainId').AsString);
         fCopyMainId := FMainId;
         canshu1 := Self.canshu1;
-        if ShowModal = 1 then begin
+        if ShowModal = 1 then
+        begin
 
         end;
       end;
@@ -315,13 +315,16 @@ end;
 
 procedure TfrmTradePlanMgeList.cxPageControl1Click(Sender: TObject);
 begin
-  if cxPageControl1.ActivePageIndex = 0 then begin
+  if cxPageControl1.ActivePageIndex = 0 then
+  begin
     dxLayoutItem_khdh.Visible := false;
     dxLayoutItem_pm.Visible := false;
     dxLayoutItem_batchno.Visible := false;
     dxLayoutItem_FtyPCId.Visible := false;
   end
-  else begin dxLayoutItem_khdh.Visible := true;
+  else
+  begin
+    dxLayoutItem_khdh.Visible := true;
     dxLayoutItem_pm.Visible := true;
     dxLayoutItem_batchno.Visible := true;
     dxLayoutItem_FtyPCId.Visible := true;
@@ -330,18 +333,20 @@ begin
 end;
 
 procedure TfrmTradePlanMgeList.cxTabControl1Change(Sender: TObject);
-begin TBRafresh.Click
+begin
+  TBRafresh.Click
 
 end;
 
-procedure TfrmTradePlanMgeList.FormClose(Sender: TObject;
+procedure TfrmTradePlanMgeList.FormClose(Sender: TObject; var Action: TCloseAction);
-  var Action: TCloseAction);
+begin
-begin inherited;
+  inherited;
   Action := cafree;
 end;
 
 procedure TfrmTradePlanMgeList.FormCreate(Sender: TObject);
-begin inherited;
+begin
+  inherited;
   canshu1 := Trim(Self.fParameters1);
   cxGrid2.Height := 250;
   cxGrid1.Align := alClient;
@@ -362,7 +367,8 @@ begin inherited;
 end;
 
 procedure TfrmTradePlanMgeList.FormDestroy(Sender: TObject);
-begin inherited;
+begin
+  inherited;
   frmTradePlanMgeList := nil;
 end;
 
@@ -391,10 +397,14 @@ procedure TfrmTradePlanMgeList.TBAddClick(Sender: TObject);
 begin
   try
     frmTradePlanInPut := TfrmTradePlanInPut.Create(Application);
-    with frmTradePlanInPut do begin PState := 0;
+    with frmTradePlanInPut do
+    begin
+      PState := 0;
       FMainId := '';
       canshu1 := Self.canshu1;
-      if ShowModal = 1 then begin InitGrid();
+      if ShowModal = 1 then
+      begin
+        InitGrid();
       end;
     end;
   finally
@@ -422,11 +432,14 @@ begin
 
   try
     frmTradePlanInPut := TfrmTradePlanInPut.Create(Application);
-    with frmTradePlanInPut do begin PState := 5;
+    with frmTradePlanInPut do
+    begin
+      PState := 5;
       FMainId := Trim(mMainId);
       ToolBar2.Visible := false;
       TBSave.Visible := false;
-      if ShowModal = 1 then begin
+      if ShowModal = 1 then
+      begin
 
       end;
     end;
@@ -437,7 +450,8 @@ begin
 end;
 
 procedure TfrmTradePlanMgeList.TBCloseClick(Sender: TObject);
-begin inherited;
+begin
+  inherited;
   close;
 end;
 
@@ -447,8 +461,10 @@ begin
   begin
     if Order_Main.IsEmpty then
       Exit;
-     if (canshu1 <> '管理') and  (canshu1 <> '高权限') then begin
+    if (canshu1 <> '管理') and (canshu1 <> '高权限') then
-        if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then begin
+    begin
+      if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+      begin
         Application.MessageBox('不能操作他人的数据!', '提示', 0);
         Exit;
       end;
@@ -457,18 +473,22 @@ begin
     if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
       Exit;
 
-     with ADOQueryBaseTemp do begin close;
+    with ADOQueryBaseTemp do
+    begin
+      close;
       sql.Clear;
-      sql.Add('select * from Trade_Cloth_Inspect where isnull(mainID,'''')<>'''' and mainID='''
+      sql.Add('select * from Trade_Cloth_Inspect where isnull(mainID,'''')<>'''' and mainID=''' + Trim(Order_Main.fieldbyname('mainID').AsString) + '''');
-      + Trim(Order_Main.fieldbyname('mainID').AsString) + '''');
       Open;
     end;
-     if not ADOQueryBaseTemp.IsEmpty then begin
+    if not ADOQueryBaseTemp.IsEmpty then
+    begin
       Application.MessageBox('已检验不能删除数据!', '提示', 0);
       Exit;
     end;
 
-    if Trim(Order_Main.fieldbyname('MainId').AsString) <> '' then begin DelData()
+    if Trim(Order_Main.fieldbyname('MainId').AsString) <> '' then
+    begin
+      DelData()
     end;
     Order_Main.Delete;
   end
@@ -476,8 +496,10 @@ begin
   begin
     if cds_mxlist.IsEmpty then
       Exit;
-     if (canshu1 <> '管理') and  (canshu1 <> '高权限') then begin
+    if (canshu1 <> '管理') and (canshu1 <> '高权限') then
-        if Trim(cds_mxlist.fieldbyname('Filler').AsString) <> Trim(DName) then begin
+    begin
+      if Trim(cds_mxlist.fieldbyname('Filler').AsString) <> Trim(DName) then
+      begin
         Application.MessageBox('不能操作他人的数据!', '提示', 0);
         Exit;
       end;
@@ -486,18 +508,22 @@ begin
     if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
       Exit;
 
-     with ADOQueryBaseTemp do begin close;
+    with ADOQueryBaseTemp do
+    begin
+      close;
       sql.Clear;
-      sql.Add('select * from Trade_Cloth_Inspect where isnull(mainID,'''')<>'''' and mainID='''
+      sql.Add('select * from Trade_Cloth_Inspect where isnull(mainID,'''')<>'''' and mainID=''' + Trim(cds_mxlist.fieldbyname('mainID').AsString) + '''');
-      + Trim(cds_mxlist.fieldbyname('mainID').AsString) + '''');
       Open;
     end;
-     if not ADOQueryBaseTemp.IsEmpty then begin
+    if not ADOQueryBaseTemp.IsEmpty then
+    begin
       Application.MessageBox('已检验不能删除数据!', '提示', 0);
       Exit;
     end;
 
-    if Trim(cds_mxlist.fieldbyname('subId').AsString) <> '' then begin DelSubData()
+    if Trim(cds_mxlist.fieldbyname('subId').AsString) <> '' then
+    begin
+      DelSubData()
     end;
     cds_mxlist.Delete;
 
@@ -512,8 +538,10 @@ begin
     if Order_Main.IsEmpty then
       Exit;
 
-    if (canshu1 <> '管理') and  (canshu1 <> '高权限') then begin
+    if (canshu1 <> '管理') and (canshu1 <> '高权限') then
-      if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then begin
+    begin
+      if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+      begin
         Application.MessageBox('不能操作他人的数据!', '提示', 0);
         Exit;
       end;
@@ -521,12 +549,14 @@ begin
 
     try
       frmTradePlanInPut := TfrmTradePlanInPut.Create(Application);
-      with frmTradePlanInPut do begin
+      with frmTradePlanInPut do
+      begin
         PState := 1;
         FMainId := Trim(Self.Order_Main.fieldbyname('MainId').AsString);
         FOrderNo := Trim(Self.Order_Main.fieldbyname('OrderNo').AsString);
         canshu1 := Self.canshu1;
-        if ShowModal = 1 then begin
+        if ShowModal = 1 then
+        begin
 
         end;
       end;
@@ -539,8 +569,10 @@ begin
     if cds_mxlist.IsEmpty then
       Exit;
 
-    if (canshu1 <> '管理') and  (canshu1 <> '高权限') then begin
+    if (canshu1 <> '管理') and (canshu1 <> '高权限') then
-      if Trim(cds_mxlist.fieldbyname('Filler').AsString) <> Trim(DName) then begin
+    begin
+      if Trim(cds_mxlist.fieldbyname('Filler').AsString) <> Trim(DName) then
+      begin
         Application.MessageBox('不能操作他人的数据!', '提示', 0);
         Exit;
       end;
@@ -548,12 +580,14 @@ begin
 
     try
       frmTradePlanInPut := TfrmTradePlanInPut.Create(Application);
-      with frmTradePlanInPut do begin
+      with frmTradePlanInPut do
+      begin
         PState := 1;
         FMainId := Trim(Self.cds_mxlist.fieldbyname('MainId').AsString);
         FOrderNo := Trim(Self.cds_mxlist.fieldbyname('OrderNo').AsString);
         canshu1 := Self.canshu1;
-        if ShowModal = 1 then begin
+        if ShowModal = 1 then
+        begin
 
         end;
       end;
@@ -592,10 +626,13 @@ begin
 
   try
     frmLabelPrint := TfrmLabelPrint.Create(Application);
-    with frmLabelPrint do begin FLMType := 'TradePlanPrint';
+    with frmLabelPrint do
+    begin
+      FLMType := 'TradePlanPrint';
       FFiltration1 := WSql;
       FFiltrationSubs := mxIds;
-      if ShowModal = 1 then begin
+      if ShowModal = 1 then
+      begin
         // Self.InitGrid();
       end;
     end;
@@ -617,11 +654,14 @@ procedure TfrmTradePlanMgeList.TcdglClick(Sender: TObject);
 begin
   try
     frmZDYHelp := TfrmZDYHelp.Create(Application);
-    with frmZDYHelp do begin flag := 'WFBCD';
+    with frmZDYHelp do
+    begin
+      flag := 'WFBCD';
       flagname := '疵点';
       fnote := true;
       V1Note.Caption := '英文名称';
-      if ShowModal = 1 then begin
+      if ShowModal = 1 then
+      begin
 
       end;
     end;
@@ -656,7 +696,8 @@ begin
      // caption:=mOrderNo+'标签设置'
       FDataID := mMainId;
 
-      if ShowModal = 1 then begin
+      if ShowModal = 1 then
+      begin
 
       end;
     end;
@@ -674,7 +715,8 @@ begin
   begin
     if Order_Main.IsEmpty then
       Exit;
-    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then begin
+    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+    begin
       Application.MessageBox('不能操作他人的数据!', '提示', 0);
       Exit;
     end;
@@ -696,7 +738,9 @@ begin
   if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
     Exit;
   try
-    with ADOQueryBaseCmd do begin close;
+    with ADOQueryBaseCmd do
+    begin
+      close;
       sql.Clear;
       sql.Add('update  Trade_Plan_Main SET status=''9'' ');
       sql.Add('where mainID=' + quotedstr(mMainId));
@@ -716,15 +760,17 @@ begin
     Application.MessageBox('计划单撤销完成失败！', '提示信息', 0);
   end;
 
-
 end;
 
 procedure TfrmTradePlanMgeList.TbcgsClick(Sender: TObject);
 begin
-  if cxPageControl1.ActivePageIndex = 1 then begin
+  if cxPageControl1.ActivePageIndex = 1 then
+  begin
     WriteCxGrid('包装指示单明细列表T3', tv3, gDllFileCaption);
   end
-  else begin WriteCxGrid('包装指示单列表T1', Tv1, gDllFileCaption);
+  else
+  begin
+    WriteCxGrid('包装指示单列表T1', Tv1, gDllFileCaption);
     WriteCxGrid('包装指示单列表T2', TV2, gDllFileCaption);
   end;
   if gIsCanDesign then
@@ -735,13 +781,19 @@ end;
 
 procedure TfrmTradePlanMgeList.TtoexcelClick(Sender: TObject);
 begin
-  if (cxPageControl1.ActivePageIndex = 0) then begin
+  if (cxPageControl1.ActivePageIndex = 0) then
-    if cxGrid2.Focused then begin TcxGridToExcel(Self.Caption, cxGrid2);
+  begin
+    if cxGrid2.Focused then
+    begin
+      TcxGridToExcel(Self.Caption, cxGrid2);
     end
-    else begin TcxGridToExcel(Self.Caption + '-明细', cxGrid1);
+    else
+    begin
+      TcxGridToExcel(Self.Caption + '-明细', cxGrid1);
     end;
   end
-  else begin
+  else
+  begin
     TcxGridToExcel(Self.Caption + '-订单明细', cxGrid3);
   end;
 end;
@@ -750,10 +802,12 @@ procedure TfrmTradePlanMgeList.TfilterClick(Sender: TObject);
 begin
   inherited;
   conno.Tag := 2;
-  if cxPageControl1.ActivePageIndex = 0 then begin
+  if cxPageControl1.ActivePageIndex = 0 then
+  begin
     try
       Tv1.BeginUpdate();
-      if ADOQueryMain.Active then begin
+      if ADOQueryMain.Active then
+      begin
         SDofilter(ADOQueryMain, SLGetFilters(dxLayoutControl_query, 1, 2));
         Order_Main.EmptyDataSet;
         SInitCDSData(ADOQueryMain, Order_Main);
@@ -762,10 +816,12 @@ begin
       Tv1.EndUpdate;
     end;
   end
-  else begin
+  else
+  begin
     try
       tv3.BeginUpdate();
-      if ADOQueryMxList.Active then begin
+      if ADOQueryMxList.Active then
+      begin
         SDofilter(ADOQueryMxList, SLGetFilters(dxLayoutControl_query, 1, 2));
         cds_mxlist.EmptyDataSet;
         SInitCDSData(ADOQueryMxList, cds_mxlist);
@@ -823,12 +879,14 @@ begin
   end;
   try
     frmAttachmentUpload := TfrmAttachmentUpload.Create(Application);
-    with frmAttachmentUpload do begin
+    with frmAttachmentUpload do
+    begin
       if Trim(canshu1) <> '查询' then
         FEditAuthority := true;
       fkeyNO := Trim(mMainId);
       fType := '指示单';
-      if ShowModal = 1 then begin
+      if ShowModal = 1 then
+      begin
 
       end;
     end;
@@ -838,9 +896,7 @@ begin
 
 end;
 
-procedure TfrmTradePlanMgeList.Tv1FocusedRecordChanged
+procedure TfrmTradePlanMgeList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
-  (Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord
-  : TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
 begin
   if fIsLoad then
     InitSub();
@@ -853,7 +909,8 @@ begin
   begin
     if Order_Main.IsEmpty then
       Exit;
-    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then begin
+    if Trim(Order_Main.fieldbyname('Filler').AsString) <> Trim(DName) then
+    begin
       Application.MessageBox('不能操作他人的数据!', '提示', 0);
       Exit;
     end;
@@ -861,19 +918,19 @@ begin
     if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
       Exit;
     try
-     with ADOQueryBaseCmd do begin close;
+      with ADOQueryBaseCmd do
+      begin
+        close;
         sql.Clear;
         sql.Add('update  Trade_Plan_Main SET status=''10'' ');
-       sql.Add('where mainID=' + quotedstr(Trim(Order_Main.fieldbyname('mainID')
+        sql.Add('where mainID=' + quotedstr(Trim(Order_Main.fieldbyname('mainID').AsString)));
-        .AsString)));
 
         sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
         sql.Add(' ' + quotedstr(Trim(DName)));
         sql.Add(',getdate() ');
         sql.Add(',' + quotedstr(Trim(Self.Caption)));
         sql.Add(',' + quotedstr(Trim('计划单完成')));
-       sql.Add(',' + quotedstr(Trim('计划单号：' +
+        sql.Add(',' + quotedstr(Trim('计划单号：' + Trim(Order_Main.fieldbyname('orderNO').AsString))));
-        Trim(Order_Main.fieldbyname('orderNO').AsString))));
         sql.Add(',' + quotedstr(Trim('成功')));
         sql.Add(')');
         execsql;
@@ -889,7 +946,8 @@ begin
   begin
     if cds_mxlist.IsEmpty then
       Exit;
-    if Trim(cds_mxlist.fieldbyname('Filler').AsString) <> Trim(DName) then begin
+    if Trim(cds_mxlist.fieldbyname('Filler').AsString) <> Trim(DName) then
+    begin
       Application.MessageBox('不能操作他人的数据!', '提示', 0);
       Exit;
     end;
@@ -897,19 +955,19 @@ begin
     if Application.MessageBox('是否核实好数据？', '提示', 32 + 4) <> IDYES then
       Exit;
     try
-     with ADOQueryBaseCmd do begin close;
+      with ADOQueryBaseCmd do
+      begin
+        close;
         sql.Clear;
         sql.Add('update  Trade_Plan_Main SET status=''10'' ');
-       sql.Add('where mainID=' + quotedstr(Trim(cds_mxlist.fieldbyname('mainID')
+        sql.Add('where mainID=' + quotedstr(Trim(cds_mxlist.fieldbyname('mainID').AsString)));
-        .AsString)));
 
         sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
         sql.Add(' ' + quotedstr(Trim(DName)));
         sql.Add(',getdate() ');
         sql.Add(',' + quotedstr(Trim(Self.Caption)));
         sql.Add(',' + quotedstr(Trim('计划单完成')));
-       sql.Add(',' + quotedstr(Trim('计划单号：' +
+        sql.Add(',' + quotedstr(Trim('计划单号：' + Trim(cds_mxlist.fieldbyname('orderNO').AsString))));
-        Trim(cds_mxlist.fieldbyname('orderNO').AsString))));
         sql.Add(',' + quotedstr(Trim('成功')));
         sql.Add(')');
         execsql;
@@ -924,19 +982,20 @@ begin
 
 end;
 
-procedure TfrmTradePlanMgeList.ButtonEdit(Sender: TObject;
+procedure TfrmTradePlanMgeList.ButtonEdit(Sender: TObject; AButtonIndex: Integer);
-  AButtonIndex: Integer);
 begin
   inherited;
   try
     frmPictureUpload := TfrmPictureUpload.Create(Application);
-    with frmPictureUpload do begin
+    with frmPictureUpload do
+    begin
       fFlileFlag := UserDataFlag + 'HX';
       FWidth := 250;
       FHeight := 300;
       FTFType := 'HX';
       FDataId := Trim(Self.ORDER_SUB.fieldbyname('subId').AsString);
-      if ShowModal = 1 then begin
+      if ShowModal = 1 then
+      begin
       end;
     end;
   finally
@@ -948,13 +1007,16 @@ procedure TfrmTradePlanMgeList.InitGrid();
 var
   strwhere: string;
   mStatus: string;
-begin strwhere := '';
+begin
+  strwhere := '';
   mStatus := cxTabControl1.Tabs[cxTabControl1.TabIndex].Caption;
   ConNo.Tag := 99;
   batchNo.Tag := 99;
   FtyPCId.Tag := 99;
   strwhere := SLGetFilters(dxLayoutControl_query, 1, 2);
-  if Trim(strwhere) <> '' then begin strwhere := ' and ' + Trim(strwhere);
+  if Trim(strwhere) <> '' then
+  begin
+    strwhere := ' and ' + Trim(strwhere);
   end;
 
   if (Trim(DParameters1) <> '高权限') then
@@ -966,19 +1028,17 @@ begin strwhere := '';
     loadProcess.Visible := true;
     loadProcess.Refresh;
 
-
     Order_Main.DisableControls;
-    with ADOQueryMain do begin
+    with ADOQueryMain do
+    begin
 
       close;
       Filtered := false;
       sql.Clear;
       sql.Add('exec P_View_TradePlanList_for_pack :timeType, :begdate,:enddate,:mStatus,:WSql');
       Parameters.ParamByName('timeType').Value := '制单日期';
-      Parameters.ParamByName('begdate').Value := FormatDateTime('yyyy-MM-dd',
+      Parameters.ParamByName('begdate').Value := FormatDateTime('yyyy-MM-dd', begdate.Date);
-        begdate.Date);
+      Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd', endDate.Date + 1);
-      Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd',
-        endDate.Date + 1);
       Parameters.ParamByName('mStatus').Value := mStatus;
       Parameters.ParamByName('WSql').Value := strwhere;
       Open;
@@ -1014,13 +1074,16 @@ begin
 end;
 
 procedure TfrmTradePlanMgeList.InitSub();
-begin ADOQuerySub.close;
+begin
+  ADOQuerySub.close;
   if Order_Main.IsEmpty then
     Exit;
   try
     TV2.BeginUpdate();
     ORDER_SUB.DisableControls;
-    with ADOQuerySub do begin close;
+    with ADOQuerySub do
+    begin
+      close;
       sql.Clear;
       sql.Add('exec P_View_TradePlanMxList_for_pack ');
       sql.Add('@mainId =' + quotedstr((Order_Main.fieldbyname('mainID').AsString)));
@@ -1054,7 +1117,9 @@ begin
     mSubId := Trim(cds_mxlist.fieldbyname('SUBID').AsString);
   end;
   //
-  with ADOQueryPrint do begin close;
+  with ADOQueryPrint do
+  begin
+    close;
     sql.Clear;
     sql.Add(' EXEC P_Trade_Print_djd_Lab ');
     sql.Add(' @CIID=''' + mSubId + '''');
@@ -1067,16 +1132,19 @@ begin
   else
     FLabVolume := Trim(ADOQueryPrint.fieldbyname('LabVolume').AsString);
 
-  if FLabVolume='' then  FLabVolume:=trim(gDefaultLableFile);
+  if FLabVolume = '' then
-  if FLabVolume = '' then begin
+    FLabVolume := trim(gDefaultLableFile);
+  if FLabVolume = '' then
+  begin
     Application.MessageBox('还未设置卷标签！', '提示信息', MB_ICONERROR);
     Exit;
   end;
   ExportFtErpFile(FLabVolume + '.rmf', ADOQueryBaseTemp);
-  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' +
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + FLabVolume + '.rmf';
-    FLabVolume + '.rmf';
 
-  if FileExists(fPrintFile) then begin RM1.LoadFromFile(fPrintFile);
+  if FileExists(fPrintFile) then
+  begin
+    RM1.LoadFromFile(fPrintFile);
     if Trim(ADOQueryPrint.fieldbyname('LabVolume').AsString) <> '次品标签' then
       RM1.DefaultCopies := 2
     else
@@ -1084,7 +1152,9 @@ begin
     RM1.ShowErrorMsg := false;
     RM1.ShowReport;
   end
-  else begin Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
+  else
+  begin
+    Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
   end;
 
 end;
@@ -1105,7 +1175,9 @@ begin
       Exit;
     mSubId := Trim(cds_mxlist.fieldbyname('SUBID').AsString);
   end;
-  with ADOQueryPrint do begin close;
+  with ADOQueryPrint do
+  begin
+    close;
     sql.Clear;
     sql.Add('exec P_Trade_Insp_Prt_djd_PackLab_test ');
     sql.Add('@subId =' + quotedstr(mSubId));
@@ -1115,37 +1187,44 @@ begin
     MLabPackage := Trim(ADOQueryPrint.fieldbyname('SLabPackage').AsString)
   else
     MLabPackage := Trim(ADOQueryPrint.fieldbyname('LabPackage').AsString);
-  if MLabPackage='' then  MLabPackage:=trim(gDefaultPackLableFile);
+  if MLabPackage = '' then
-  if MLabPackage = '' then begin
+    MLabPackage := trim(gDefaultPackLableFile);
+  if MLabPackage = '' then
+  begin
     Application.MessageBox('还未设置包标签！', '提示信息', MB_ICONERROR);
     Exit;
   end;
   ExportFtErpFile(Trim(MLabPackage) + '.rmf', ADOQueryBaseTemp);
 
-  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' +
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(MLabPackage) + '.rmf';
-    Trim(MLabPackage) + '.rmf';
+  if not FileExists(fPrintFile) then
-  if not FileExists(fPrintFile) then begin
+  begin
     Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
     Exit;
   end;
-  if FileExists(fPrintFile) then begin RM1.LoadFromFile(fPrintFile);
+  if FileExists(fPrintFile) then
+  begin
+    RM1.LoadFromFile(fPrintFile);
     RM1.DefaultCopies := 1;
     RM1.ShowErrorMsg := false;
     RM1.ShowReport;
   end
-  else begin Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
+  else
+  begin
+    Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
   end;
 
 end;
 
 procedure TfrmTradePlanMgeList.OrderNoPropertiesChange(Sender: TObject);
-begin inherited;
+begin
+  inherited;
   Tfilter.Click;
 end;
 
-procedure TfrmTradePlanMgeList.OrderNoPropertiesEditValueChanged
+procedure TfrmTradePlanMgeList.OrderNoPropertiesEditValueChanged(Sender: TObject);
-  (Sender: TObject);
+begin
-begin inherited;
+  inherited;
   InitGrid();
 end;
 
@@ -1153,7 +1232,8 @@ procedure TfrmTradePlanMgeList.InitMxGrid();
 var
   strwhere: string;
   mStatus: string;
-begin strwhere := '';
+begin
+  strwhere := '';
   try
     loadProcess.Visible := true;
     loadProcess.Refresh;
@@ -1162,22 +1242,24 @@ begin strwhere := '';
     batchNo.Tag := 2;
     FtyPCId.Tag := 2;
     strwhere := SLGetFilters(dxLayoutControl_query, 1, 2);
-    if Trim(strwhere) <> '' then begin strwhere := ' and ' + Trim(strwhere);
+    if Trim(strwhere) <> '' then
+    begin
+      strwhere := ' and ' + Trim(strwhere);
     end;
     mStatus := cxTabControl1.Tabs[cxTabControl1.TabIndex].Caption;
     if (Trim(DParameters1) <> '高权限') then
       strwhere := strwhere + ' and A.Filler=' + quotedstr(Trim(DName));
 
     cds_mxlist.DisableControls;
-    with ADOQueryMxList do begin close;
+    with ADOQueryMxList do
+    begin
+      close;
       Filtered := false;
       sql.Clear;
       sql.Add('exec P_View_TradePlanMxList_for_pack :timeType, :begdate,:enddate,:mStatus,:WSql');
       Parameters.ParamByName('timeType').Value := '制单日期';
-      Parameters.ParamByName('begdate').Value := FormatDateTime('yyyy-MM-dd',
+      Parameters.ParamByName('begdate').Value := FormatDateTime('yyyy-MM-dd', begdate.Date);
-        begdate.Date);
+      Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd', endDate.Date + 1);
-      Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd',
-        endDate.Date + 1);
       Parameters.ParamByName('mStatus').Value := mStatus;
     //  if strwhere<> then
       Parameters.ParamByName('WSql').Value := ' ' + strwhere;
@@ -1203,22 +1285,20 @@ begin
   try
     Result := false;
     ADOQueryBaseCmd.Connection.BeginTrans;
-    with ADOQueryBaseCmd do begin close;
+    with ADOQueryBaseCmd do
+    begin
+      close;
       sql.Clear;
-      sql.Add('delete Trade_Plan_Main where MainId=''' +
+      sql.Add('delete Trade_Plan_Main where MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
-        Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
+      sql.Add('delete Trade_Plan_Sub where MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
-      sql.Add('delete Trade_Plan_Sub where MainId=''' +
+      sql.Add('delete Trade_Plan_Fty where MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
-        Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
-      sql.Add('delete Trade_Plan_Fty where MainId=''' +
-        Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
 
       sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
       sql.Add(' ' + quotedstr(Trim(DName)));
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(Trim(Self.Caption)));
       sql.Add(',' + quotedstr(Trim('指示单删除')));
-      sql.Add(',' + quotedstr(Trim('指示单号：' +
+      sql.Add(',' + quotedstr(Trim('指示单号：' + Trim(Order_Main.fieldbyname('OrderNO').AsString))));
-        Trim(Order_Main.fieldbyname('OrderNO').AsString))));
       sql.Add(',' + quotedstr(Trim('成功')));
       sql.Add(')');
       execsql;
@@ -1232,6 +1312,7 @@ begin
   end;
 end;
 /////////////////////////////////////////////////
+
 function TfrmTradePlanMgeList.DelSubData(): Boolean;
 var
   mSubId: string;
@@ -1240,7 +1321,9 @@ begin
     Result := false;
     mSubId := Trim(cds_mxlist.fieldbyname('subId').AsString);
     ADOQueryBaseCmd.Connection.BeginTrans;
-    with ADOQueryBaseCmd do begin close;
+    with ADOQueryBaseCmd do
+    begin
+      close;
       sql.Clear;
      // sql.Add('delete Trade_Plan_Main where MainId=''' +
       //  Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
@@ -1254,8 +1337,7 @@ begin
       sql.Add(',getdate() ');
       sql.Add(',' + quotedstr(Trim(Self.Caption)));
       sql.Add(',' + quotedstr(Trim('指示单删除')));
-      sql.Add(',' + quotedstr(Trim('指示单号：' +
+      sql.Add(',' + quotedstr(Trim('指示单号：' + Trim(Order_Main.fieldbyname('OrderNO').AsString) + ';明细id=' + mSubId)));
-        Trim(Order_Main.fieldbyname('OrderNO').AsString)+';明细id='+mSubId)));
       sql.Add(',' + quotedstr(Trim('成功')));
       sql.Add(')');
       execsql;
@@ -1269,6 +1351,7 @@ begin
   end;
 end;
 ////////////////////////////////////////////////
+
 procedure TfrmTradePlanMgeList.threadLoadform();
 var
   thread: TThread;
@@ -1278,17 +1361,16 @@ begin
     procedure
     begin
 
-    with ADOQueryMain do begin
+      with ADOQueryMain do
+      begin
 
         close;
         Filtered := false;
         sql.Clear;
         sql.Add('exec P_View_TradePlanList_for_pack :timeType, :begdate,:enddate,:mStatus,:WSql');
         Parameters.ParamByName('timeType').Value := '制单日期';
-      Parameters.ParamByName('begdate').Value := FormatDateTime('yyyy-MM-dd',
+        Parameters.ParamByName('begdate').Value := FormatDateTime('yyyy-MM-dd', begdate.Date);
-        begdate.Date);
+        Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd', endDate.Date + 1);
-      Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd',
-        endDate.Date + 1);
         Parameters.ParamByName('mStatus').Value := '';
         Parameters.ParamByName('WSql').Value := '';
         Open;
@@ -1301,3 +1383,4 @@ begin
 end;
 
 end.
+

项目代码/DJ/G01贸易生产计划/djdPackPlan.dpr

@@ -32,8 +32,8 @@ uses
   U_ZDYHelpSel in '..\..\..\public10\ThreeFun\Form\U_ZDYHelpSel.pas' {frmZDYHelpSel},
   getpic in 'getpic.pas' {FormGetPic},
   U_SysLogOrder in 'U_SysLogOrder.pas' {frmSysLogOrder},
-  U_TradePlanMgeList in 'U_TradePlanMgeList.pas' {frmTradePlanMgeList},
+  U_ItemTestList in 'U_ItemTestList.pas' {frmItemTestList},
-  U_TradePlanInPut in 'U_TradePlanInPut.pas' {frmTradePlanInPut},
+  U_ItemTestInPut in 'U_ItemTestInPut.pas' {frmItemTestInPut},
   U_FormLayOutDesign in '..\..\..\public10\design\U_FormLayOutDesign.pas',
   U_PictureList in '..\A00通用窗体\U_PictureList.pas' {frmPictureList},
   U_PictureUpload in '..\A00通用窗体\U_PictureUpload.pas' {frmPictureUpload},

项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj

@@ -4,7 +4,7 @@
         <MainSource>djdPackPlan.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.2</ProjectVersion>
@@ -13,16 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
-        <Base_Android64>true</Base_Android64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
@@ -38,24 +28,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Android64)'!=''">
-        <Cfg_1_Android64>true</Cfg_1_Android64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''">
-        <Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_1)'=='true') or '$(Cfg_1_OSX64)'!=''">
-        <Cfg_1_OSX64>true</Cfg_1_OSX64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
         <Cfg_1_Win32>true</Cfg_1_Win32>
         <CfgParent>Cfg_1</CfgParent>
@@ -67,24 +39,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
-        <Cfg_2_Android64>true</Cfg_2_Android64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
-        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
-        <Cfg_2_OSX64>true</Cfg_2_OSX64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -104,13 +58,6 @@
         <VerInfo_Locale>2052</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android64)'!=''">
-        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
-        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
@@ -128,15 +75,6 @@
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
@@ -145,18 +83,9 @@
         <DCC_Optimize>false</DCC_Optimize>
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G01贸易生产计划\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -223,11 +152,11 @@
         <DCCReference Include="U_SysLogOrder.pas">
             <Form>frmSysLogOrder</Form>
         </DCCReference>
-        <DCCReference Include="U_TradePlanMgeList.pas">
+        <DCCReference Include="U_ItemTestList.pas">
-            <Form>frmTradePlanMgeList</Form>
+            <Form>frmItemTestList</Form>
         </DCCReference>
-        <DCCReference Include="U_TradePlanInPut.pas">
+        <DCCReference Include="U_ItemTestInPut.pas">
-            <Form>frmTradePlanInPut</Form>
+            <Form>frmItemTestInPut</Form>
         </DCCReference>
         <DCCReference Include="..\..\..\public10\design\U_FormLayOutDesign.pas"/>
         <DCCReference Include="..\A00通用窗体\U_PictureList.pas">
@@ -286,10 +215,6 @@
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
-                <Platform value="Android64">True</Platform>
-                <Platform value="iOSDevice64">True</Platform>
-                <Platform value="Linux64">True</Platform>
-                <Platform value="OSX64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>

项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local

@@ -61,21 +61,25 @@
     <File Path="getpic.dfm"/>
     <File Path="U_SysLogOrder.pas"/>
     <File Path="U_SysLogOrder.dfm"/>
-    <File Path="U_TradePlanMgeList.pas"/>
-    <File Path="U_TradePlanMgeList.dfm"/>
-    <File Path="U_TradePlanInPut.pas"/>
-    <File Path="U_TradePlanInPut.dfm"/>
     <File Path="U_UptPlanDataToRoll.pas"/>
     <File Path="U_UptPlanDataToRoll.dfm"/>
+    <File Path="U_ItemTestList.pas"/>
+    <File Path="U_ItemTestList.dfm"/>
+    <File Path="U_ItemTestInPut.pas"/>
+    <File Path="U_ItemTestInPut.dfm"/>
   </ProjectSortOrder>
 	<Transactions>
     <Transaction>1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.721,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanInPut.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.710,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_TradePlanMgeList.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\U_ItemTestList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm</Transaction>
   </Transactions>
 </BorlandProject>

项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local

@@ -4,104 +4,104 @@
     <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.870,=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\U_CDList.pas=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.870,=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.pas=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\U_CDList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.769,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.pas=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.817,D:\Dp10RepoV1\项目代码\djdPack\G00贸易通用窗体\U_TradePlanSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.817,D:\Dp10RepoV1\项目代码\djdPack\G00贸易通用窗体\U_TradePlanSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.dfm=D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\U_CDList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.dfm=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.201,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.dfm=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.pas=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\U_CDList.dfm=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\DJ"/>

项目代码/DJ/G03贸易布匹检验/U_KeyBoard.dfm

@@ -2,7 +2,7 @@ object FrameKeyBoard: TFrameKeyBoard
   Left = 0
   Top = 0
   Width = 314
-  Height = 235
+  Height = 357
   Font.Charset = ANSI_CHARSET
   Font.Color = clWindowText
   Font.Height = -13
@@ -14,11 +14,11 @@ object FrameKeyBoard: TFrameKeyBoard
     Left = 0
     Top = 0
     Width = 314
-    Height = 235
+    Height = 357
     Align = alClient
     Frame.Visible = False
     TabOrder = 0
-    ExplicitHeight = 192
+    ExplicitTop = 1
     object SpeedButton1: TSpeedButton
       Left = 1
       Top = 2
@@ -125,8 +125,8 @@ object FrameKeyBoard: TFrameKeyBoard
     end
     object SpeedButton9: TSpeedButton
       Tag = 9
-      Left = 124
+      Left = 125
-      Top = 125
+      Top = 126
       Width = 60
       Height = 60
       Caption = '9'
@@ -165,7 +165,7 @@ object FrameKeyBoard: TFrameKeyBoard
     end
     object SpeedButton_dot: TSpeedButton
       Left = 186
-      Top = 125
+      Top = 124
       Width = 60
       Height = 60
       Caption = '.'
@@ -179,7 +179,7 @@ object FrameKeyBoard: TFrameKeyBoard
     object SpeedButton_yc: TSpeedButton
       Tag = 9
       Left = 248
-      Top = 2
+      Top = 1
       Width = 60
       Height = 60
       Caption = #38544#34255
@@ -193,7 +193,7 @@ object FrameKeyBoard: TFrameKeyBoard
     object SpeedButton_zdykey2: TSpeedButton
       Tag = 9
       Left = 248
-      Top = 63
+      Top = 124
       Width = 60
       Height = 60
       Caption = 'C'
@@ -206,8 +206,8 @@ object FrameKeyBoard: TFrameKeyBoard
     end
     object SpeedButton_zdykey1: TSpeedButton
       Tag = 9
-      Left = 248
+      Left = 249
-      Top = 125
+      Top = 63
       Width = 60
       Height = 60
       Caption = 'A'
@@ -219,8 +219,8 @@ object FrameKeyBoard: TFrameKeyBoard
       ParentFont = False
     end
     object SpeedButton10: TSpeedButton
-      Left = 2
+      Left = 1
-      Top = 187
+      Top = 190
       Width = 60
       Height = 44
       Caption = '-'
@@ -231,5 +231,60 @@ object FrameKeyBoard: TFrameKeyBoard
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object SpeedButton11: TSpeedButton
+      Tag = 9
+      Left = 248
+      Top = 186
+      Width = 60
+      Height = 60
+      Caption = 'C'
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object SpeedButton12: TSpeedButton
+      Tag = 9
+      Left = 187
+      Top = 187
+      Width = 60
+      Height = 60
+      Caption = 'D'
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object SpeedButton13: TSpeedButton
+      Tag = 9
+      Left = 125
+      Top = 187
+      Width = 60
+      Height = 60
+      Caption = 'E'
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object SpeedButton14: TSpeedButton
+      Left = 63
+      Top = 187
+      Width = 60
+      Height = 60
+      Caption = 'F'
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
   end
 end

项目代码/DJ/G03贸易布匹检验/U_KeyBoard.pas

@@ -28,6 +28,10 @@ type
     SpeedButton_zdykey2: TSpeedButton;
     SpeedButton_zdykey1: TSpeedButton;
     SpeedButton10: TSpeedButton;
+    SpeedButton11: TSpeedButton;
+    SpeedButton12: TSpeedButton;
+    SpeedButton13: TSpeedButton;
+    SpeedButton14: TSpeedButton;
   private
     { Private declarations }
   public

项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas

@@ -18,7 +18,7 @@ uses
   cxGeometry, dxFramedControl, dxPanel, U_KeyBoard, cxGroupBox,
   cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel, RM_RichEdit, cxProgressBar,
   cxCurrencyEdit, Xml.XMLDoc, Xml.xmldom, Xml.XMLIntf, cxDateUtils,
-  System.DateUtils, cxLabel;
+  System.DateUtils, cxLabel, cxButtons;
 
 type
   TfrmMachRollMain = class(TfrmBaseList)
@@ -136,7 +136,6 @@ type
     dxLayoutItem_zhfield: TdxLayoutItem;
     AOrdDefNote1: TcxRichEdit;
     dxLayoutItem_pic: TdxLayoutItem;
-    dxLayoutAutoCreatedGroup2: TdxLayoutAutoCreatedGroup;
     cds_params: TClientDataSet;
     cds_paramsdabao: TStringField;
     cds_paramspackRolls: TIntegerField;
@@ -294,11 +293,13 @@ type
     dxLayoutAutoCreatedGroup9: TdxLayoutAutoCreatedGroup;
     dxLayoutAutoCreatedGroup11: TdxLayoutAutoCreatedGroup;
     dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup;
-    cxLabel2: TcxLabel;
     Tv2CIFType: TcxGridDBColumn;
-    cxLabel1: TcxLabel;
+    LYFlag: TcxComboBox;
-    CIFPoints: TcxButtonEdit;
+    dxLayoutItem_LYFlag: TdxLayoutItem;
-    CIFnote: TcxButtonEdit;
+    btnClear: TcxButton;
+    dxLayoutItem_btnClear: TdxLayoutItem;
+    BatchNoQty: TcxTextEdit;
+    dxLayoutItem_BatchNoQty: TdxLayoutItem;
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure Button_badClick(Sender: TObject);
@@ -348,6 +349,7 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure hand_feelPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure frameBads1cxButton1Click(Sender: TObject);
+    procedure btnClearClick(Sender: TObject);
   private
     FCIID, FOperationStatus, FCIFName, FWorkshop: string;
     FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -763,6 +765,28 @@ begin
   end;
 end;
 
+procedure TfrmMachRollMain.btnClearClick(Sender: TObject);
+begin
+  inherited;
+  BatchNO.text := '';
+  PieceNo.text := '';
+  InputMeter.text := '';
+  C_GramWeight1.text := '';
+  C_GramWeight2.text := '';
+  C_GramWeight3.text := '';
+  ValidC_Width.text := '';
+  BDBC_Width.text := '';
+  hand_feel.text := '';
+  color_diff.text := '';
+  TW_diff.text := '';
+  LMR_diff.text := '';
+  color_light.text := '';
+  JingMi.text := '';
+  WeiMi.text := '';
+  LYFlag.text := '';
+  unitPieces.text := '';
+end;
+
 procedure TfrmMachRollMain.btnRKClick(Sender: TObject);
 var
   MINo, MStkIds: string;
@@ -991,12 +1015,12 @@ begin
     end;
     if trim(fCanInputFs) = '1' then
     begin
-      cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.6);
+//      cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.6);
       frameKeyBoard1.SpeedButton10.Visible := true;
     end
     else
     begin
-      cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.55);
+//      cxGroupBox_keys.ClientHeight := round(cxGrid3.ClientHeight * 0.55);
       frameKeyBoard1.SpeedButton10.Visible := false;
     end;
   finally
@@ -1362,7 +1386,7 @@ begin
       FC_Code := trim(fieldbyName('C_Code').AsString);
       FC_Name := trim(fieldbyName('C_Name').AsString);
       FC_EName := trim(fieldbyName('C_EName').AsString);
-      // FBatchNO := Trim(ADOTmp.fieldbyname('BatchNO').AsString);
+      FBatchNO := Trim(fieldbyname('BatchNO').AsString);
       FC_Spec := trim(fieldbyName('C_Spec').AsString);
       FC_Color := trim(fieldbyName('C_Color').AsString);
       FC_ColorNo := trim(fieldbyName('C_ColorNo').AsString);
@@ -1446,7 +1470,7 @@ begin
       if fieldbyName('DecimalKg').Value <> null then
         cds_params.fieldbyName('kgPlace').value := fieldbyName('DecimalKg').AsInteger;
       cds_params.Post;
-      //
+      //ÂäÉ«£¨¸×ºÅ£©
       BatchNO.Text := trim(fieldbyName('batchNo').AsString);
 
       if (fields.FindField('mcxs') <> nil) and (ADOQueryBaseTemp.FieldByName('zhxs').AsFloat > 0) then
@@ -1466,6 +1490,7 @@ begin
       FtyPCId.Text := FFtyPCId;
       BCIOID.Text := FBCIOID;
       Piece.Text := trim(fieldbyName('ordPiece').AsString);
+      BatchNoQty.text := trim(fieldbyName('BatchNoQty').AsString);
       Qty.Text := trim(fieldbyName('ordQty').AsString) + trim(fieldbyName('ordUnit').AsString);
       // ƤÖØ
       Tare.Text := trim(fieldbyName('RuleLaterTare').AsString);
@@ -2379,8 +2404,8 @@ begin
     fieldbyName('CIFEnd').value := trim(frameBads1.CIFEnd.Text);
     fieldbyName('CIFNumber').value := strtointdef(trim(frameBads1.CIFNumber.Text), 0);
 
-    fieldbyName('CIFPoints').value := StrToFloatDef(trim(CIFPoints.Text), 0);
+    fieldbyName('CIFPoints').value := StrToFloatDef(trim(frameBads1.CIFPoints.Text), 0);
-    fieldbyName('CIFnote').value := trim(CIFnote.Text);
+    fieldbyName('CIFnote').value := trim(frameBads1.CIFnote.Text);
     fieldbyName('CIFType').value := trim(CIFType);
 //    if frameBads1.RadioGroup1.ItemIndex > -1 then
 //    begin
@@ -2403,8 +2428,8 @@ begin
   frameBads1.CIFBeg.Text := '';
   frameBads1.CIFEnd.Text := '';
   frameBads1.CIFQty.Text := '';
-  CIFPoints.Text := '';
+  frameBads1.CIFPoints.Text := '';
-  CIFnote.Text := '';
+  frameBads1.CIFnote.Text := '';
   frameBads1.dxPanel1.Visible := false;
   cxPageControl1.ActivePageIndex := 0;
 end;
@@ -2791,6 +2816,7 @@ begin
       fieldbyName('color_light').value := trim(color_light.Text);
       fieldbyName('JingMi').value := trim(JingMi.Text);
       fieldbyName('WeiMi').value := trim(WeiMi.Text);
+      fieldbyName('LYFlag').value := trim(LYFlag.Text);
       /// мӵÄÒ»¶Ñ ///
 
       //Æ´Æ¥

项目代码/DJ/G03贸易布匹检验/U_frameBads.dfm

@@ -22,9 +22,9 @@ object frameBads: TframeBads
     Visible = False
     object RadioGroup1: TRadioGroup
       Left = 0
-      Top = 108
+      Top = 227
       Width = 329
-      Height = 132
+      Height = 62
       Align = alBottom
       Columns = 2
       Ctl3D = True
@@ -43,22 +43,25 @@ object frameBads: TframeBads
       ParentCtl3D = False
       ParentFont = False
       TabOrder = 0
+      Visible = False
     end
     object dxPanel3: TdxPanel
       Left = 0
-      Top = 240
+      Top = 99
       Width = 329
-      Height = 49
+      Height = 128
       Align = alBottom
       Frame.Borders = [bLeft, bRight, bBottom]
       TabOrder = 1
+      ExplicitTop = 98
       object cxButton1: TcxButton
-        Left = 25
+        Left = 4
-        Top = 3
+        Top = 85
         Width = 71
         Height = 41
         Caption = #21462#28040#36873#25321
         TabOrder = 0
+        Visible = False
         Font.Charset = ANSI_CHARSET
         Font.Color = clWindowText
         Font.Height = -13
@@ -68,8 +71,8 @@ object frameBads: TframeBads
         OnClick = cxButton1Click
       end
       object cxButton2: TcxButton
-        Left = 174
+        Left = 116
-        Top = 4
+        Top = 84
         Width = 75
         Height = 38
         Caption = #30830' '#23450
@@ -82,10 +85,48 @@ object frameBads: TframeBads
         ParentFont = False
         OnClick = cxButton2Click
       end
+      object cxLabel1: TcxLabel
+        Left = 46
+        Top = 8
+        Caption = #25187#20998
+      end
+      object CIFPoints: TcxButtonEdit
+        Left = 117
+        Top = 4
+        Hint = 'CIFPoints/'#25187#20998
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Style.HotTrack = False
+        Style.TransparentBorder = False
+        TabOrder = 3
+        Width = 121
+      end
+      object cxLabel2: TcxLabel
+        Left = 17
+        Top = 47
+        Caption = #30133#28857#25551#36848
+      end
+      object CIFnote: TcxButtonEdit
+        Left = 117
+        Top = 43
+        Hint = 'CIFnote/'#30133#28857#25551#36848
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Style.HotTrack = False
+        Style.TransparentBorder = False
+        TabOrder = 5
+        Width = 200
+      end
     end
     object dxLayoutControl1: TdxLayoutControl
       Left = 0
-      Top = 9
+      Top = 0
       Width = 329
       Height = 99
       Align = alBottom
@@ -97,6 +138,7 @@ object frameBads: TframeBads
       ParentFont = False
       TabOrder = 2
       LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
+      ExplicitTop = 9
       object CIFBeg: TcxTextEdit
         Left = 53
         Top = 54

项目代码/DJ/G03贸易布匹检验/U_frameBads.pas

@@ -9,7 +9,7 @@ uses
   Vcl.StdCtrls, Vcl.ExtCtrls, cxTextEdit, MovePanel, Vcl.Buttons, cxGeometry,
   dxFramedControl, Vcl.Menus, cxButtons, dxPanel, cxScrollBox,
   dxLayoutcxEditAdapters, dxLayoutContainer, cxClasses, dxLayoutControl, Data.DB,
-  Data.Win.ADODB, cxCheckBox;
+  Data.Win.ADODB, cxCheckBox, cxLabel, cxMaskEdit, cxButtonEdit;
 
 type
   TframeBads = class(TFrame)
@@ -43,6 +43,10 @@ type
     dxLayoutAutoCreatedGroup1: TdxLayoutAutoCreatedGroup;
     cxCheck_len: TcxCheckBox;
     dxLayoutItem_checkLen: TdxLayoutItem;
+    cxLabel1: TcxLabel;
+    CIFPoints: TcxButtonEdit;
+    cxLabel2: TcxLabel;
+    CIFnote: TcxButtonEdit;
     procedure cxButton2Click(Sender: TObject);
     procedure cxButton1Click(Sender: TObject);
     procedure CIFBegPropertiesEditValueChanged(Sender: TObject);