~

2026-01-22 09:52:52 +08:00 · 2026-01-22 09:52:52 +08:00 · 155d7daf14
commit 155d7daf14
parent 60201bb1d4
9 changed files with 652 additions and 335 deletions
--- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.dfm
@ -118,20 +118,20 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      AutoSize = True
      Caption = #23548#20837#35746#21333
      ImageIndex = 28
      Wrap = True
      OnClick = ToolButton1Click
    end
    object TBCK: TToolButton
-      Left = 0
+      Left = 998
-      Top = 38
+      Top = 0
      AutoSize = True
      Caption = #26597#30475
      ImageIndex = 8
      Wrap = True
      Visible = False
      OnClick = TBCKClick
    end
    object ToolButton4: TToolButton
-      Left = 71
+      Left = 0
      Top = 38
      AutoSize = True
      Caption = #38468#20214
@ -140,7 +140,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      OnClick = ToolButton4Click
    end
    object TWC: TToolButton
-      Left = 142
+      Left = 71
      Top = 38
      AutoSize = True
      Caption = #23436#25104
@ -148,7 +148,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      OnClick = TWCClick
    end
    object Ttoexcel: TToolButton
-      Left = 213
+      Left = 142
      Top = 38
      AutoSize = True
      Caption = #23548#20986
@ -156,7 +156,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      OnClick = TtoexcelClick
    end
    object TNowc: TToolButton
-      Left = 284
+      Left = 213
      Top = 38
      AutoSize = True
      Caption = #25764#38144#23436#25104
@ -164,7 +164,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      OnClick = TNowcClick
    end
    object Tcdgl: TToolButton
-      Left = 387
+      Left = 316
      Top = 38
      AutoSize = True
      Caption = #30133#28857#31649#29702
@ -172,7 +172,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      OnClick = TcdglClick
    end
    object Tupdateto: TToolButton
-      Left = 490
+      Left = 419
      Top = 38
      AutoSize = True
      Caption = #25968#25454#21516#27493
@ -181,7 +181,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      OnClick = TupdatetoClick
    end
    object Tbcgs: TToolButton
-      Left = 593
+      Left = 522
      Top = 38
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -189,7 +189,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      OnClick = TbcgsClick
    end
    object ToolButton3: TToolButton
-      Left = 696
+      Left = 625
      Top = 38
      AutoSize = True
      Caption = #25171#21360#30721#21333
@ -197,15 +197,22 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      OnClick = ToolButton3Click
    end
    object TBJYbutton: TToolButton
-      Left = 799
+      Left = 728
      Top = 38
      AutoSize = True
-      Caption = #25171#21360#39564#36135#20998#26512#25253#21578
+      Caption = #23548#20986#39564#36135#20998#26512#25253#21578
      ImageIndex = 21
      OnClick = TBJYbuttonClick
    end
    object btn1: TToolButton
      Left = 895
      Top = 38
      Caption = #25171#21360#39564#36135#20998#26512#25253#21578
      ImageIndex = 21
      OnClick = btn1Click
    end
    object TBClose: TToolButton
-      Left = 966
+      Left = 1064
      Top = 38
      AutoSize = True
      Caption = #20851#38381
@ -225,52 +232,28 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
    OptionsItem.SizableVert = True
    object custName: TcxTextEdit
      Tag = 2
-      Left = 629
+      Left = 671
-      Top = 7
+      Top = 11
      Properties.OnChange = TfilterClick
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 3
      Width = 109
    end
    object ConNo: TcxTextEdit
      Tag = 2
      Left = 778
      Top = 7
      Properties.OnChange = TfilterClick
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 4
      Width = 109
    end
    object ConNo: TcxTextEdit
      Tag = 2
      Left = 820
      Top = 11
      Properties.OnChange = TfilterClick
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 5
      Width = 105
    end
    object BuyConNo: TcxTextEdit
      Tag = 2
      Left = 10000
-      Top = 9986
+      Top = 9975
      ParentFont = False
      Properties.OnChange = TfilterClick
      Style.BorderColor = clWindowFrame
      Style.BorderStyle = ebs3D
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 7
      Visible = False
      Width = 121
    end
    object OrderNo: TcxTextEdit
      Tag = 2
      Left = 439
      Top = 7
      Properties.OnChange = OrderNoPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 2
      Width = 109
    end
    object ywy: TcxTextEdit
      Tag = 99
      Left = 10000
      Top = 9986
      ParentFont = False
      Properties.OnChange = TfilterClick
      Style.BorderColor = clWindowFrame
@ -281,10 +264,34 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      Visible = False
      Width = 121
    end
    object OrderNo: TcxTextEdit
      Tag = 2
      Left = 481
      Top = 11
      Properties.OnChange = OrderNoPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 3
      Width = 109
    end
    object ywy: TcxTextEdit
      Tag = 99
      Left = 10000
      Top = 9975
      ParentFont = False
      Properties.OnChange = TfilterClick
      Style.BorderColor = clWindowFrame
      Style.BorderStyle = ebs3D
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 9
      Visible = False
      Width = 121
    end
    object C_Name: TcxTextEdit
      Tag = 2
-      Left = 964
+      Left = 1006
-      Top = 7
+      Top = 11
      ParentFont = False
      Properties.OnChange = TfilterClick
      Style.Font.Charset = ANSI_CHARSET
@ -295,48 +302,61 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      Style.HotTrack = False
      Style.TransparentBorder = False
      Style.IsFontAssigned = True
-      TabOrder = 5
+      TabOrder = 6
      Width = 121
    end
    object endDate: TcxDateEdit
-      Left = 242
+      Left = 284
-      Top = 7
+      Top = 11
      Properties.ImmediatePost = True
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 2
      Width = 132
    end
    object begdate: TcxDateEdit
      Left = 110
      Top = 11
      AutoSize = False
      Properties.ImmediatePost = True
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 1
-      Width = 132
+      Height = 27
-    end
+      Width = 143
    object begdate: TcxDateEdit
      Left = 88
      Top = 7
      Properties.ImmediatePost = True
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 0
      Width = 123
    end
    object FtyPCId: TcxTextEdit
      Tag = 2
      Left = 10000
-      Top = 9986
+      Top = 9975
      Properties.OnChange = TfilterClick
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 9
+      TabOrder = 10
      Visible = False
      Width = 105
    end
    object batchNo: TcxTextEdit
      Tag = 2
-      Left = 1166
+      Left = 1208
-      Top = 7
+      Top = 11
      Properties.OnChange = TfilterClick
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 6
+      TabOrder = 7
      Width = 121
    end
    object TimeType: TComboBox
      Left = 16
      Top = 11
      Width = 85
      Height = 29
      TabOrder = 0
      Text = #21046#21333#26085#26399
      Items.Strings = (
        #21046#21333#26085#26399
        #23436#25104#26085#26399)
    end
    object dxLayoutControl_queryGroup_Root: TdxLayoutGroup
      AlignHorz = ahParentManaged
      AlignVert = avParentManaged
@ -345,7 +365,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      SizeOptions.SizableHorz = True
      SizeOptions.SizableVert = True
      Hidden = True
-      ItemIndex = 2
+      ItemIndex = 1
      LayoutDirection = ldHorizontal
      Padding.Bottom = -5
      Padding.Top = -5
@ -355,14 +375,13 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
    end
    object dxLayoutItem1: TdxLayoutItem
      Parent = dxLayoutControl_queryGroup_Root
      Visible = False
      AllowRemove = False
      CaptionOptions.Text = #35746#21333#21495
      Control = OrderNo
      ControlOptions.OriginalHeight = 27
      ControlOptions.OriginalWidth = 109
      ControlOptions.ShowBorder = False
-      Index = 2
+      Index = 3
    end
    object dxLayoutItem2: TdxLayoutItem
      Parent = dxLayoutControl_queryGroup_Root
@ -373,7 +392,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      ControlOptions.OriginalHeight = 27
      ControlOptions.OriginalWidth = 109
      ControlOptions.ShowBorder = False
-      Index = 3
+      Index = 4
    end
    object dxLayoutItem_ywy: TdxLayoutItem
      Tag = 99
@ -391,17 +410,16 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      ControlOptions.OriginalHeight = 27
      ControlOptions.OriginalWidth = 121
      ControlOptions.ShowBorder = False
-      Index = 5
+      Index = 6
    end
    object dxLayoutItem_beg: TdxLayoutItem
      Parent = dxLayoutControl_queryGroup_Root
-      SizeOptions.Width = 195
+      SizeOptions.Width = 143
      CaptionOptions.Text = #21046#21333#26085#26399
      Control = begdate
      ControlOptions.OriginalHeight = 27
-      ControlOptions.OriginalWidth = 123
+      ControlOptions.OriginalWidth = 133
      ControlOptions.ShowBorder = False
-      Index = 0
+      Index = 1
    end
    object dxLayoutItem_end: TdxLayoutItem
      Parent = dxLayoutControl_queryGroup_Root
@ -411,7 +429,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      ControlOptions.OriginalHeight = 27
      ControlOptions.OriginalWidth = 132
      ControlOptions.ShowBorder = False
-      Index = 1
+      Index = 2
    end
    object dxLayoutItem_hth: TdxLayoutItem
      Parent = dxLayoutControl_queryGroup_Root
@ -420,7 +438,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      ControlOptions.OriginalHeight = 27
      ControlOptions.OriginalWidth = 105
      ControlOptions.ShowBorder = False
-      Index = 4
+      Index = 5
    end
    object dxLayoutItem_khdh: TdxLayoutItem
      Tag = 99
@ -447,7 +465,15 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      ControlOptions.OriginalHeight = 27
      ControlOptions.OriginalWidth = 121
      ControlOptions.ShowBorder = False
-      Index = 6
+      Index = 7
    end
    object dxLayoutItem3: TdxLayoutItem
      Parent = dxLayoutControl_queryGroup_Root
      Control = TimeType
      ControlOptions.OriginalHeight = 29
      ControlOptions.OriginalWidth = 85
      ControlOptions.ShowBorder = False
      Index = 0
    end
  end
  object cxPageControl1: TcxPageControl [2]
@ -466,6 +492,8 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
    object cxTabSheet1: TcxTabSheet
      Caption = #27719#24635#35270#22270
      ImageIndex = 0
      ExplicitWidth = 0
      ExplicitHeight = 0
      object cxGrid1: TcxGrid
        Left = 17
        Top = 3
@ -1376,7 +1404,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
      object cxSplitter1: TcxSplitter
        Left = 0
        Top = 270
-        Width = 1113
+        Width = 8
        Height = 8
        HotZoneClassName = 'TcxMediaPlayer9Style'
        AlignSplitter = salBottom
--- a/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas
+++ b/项目代码/wenshangkm/G01贸易生产计划/U_TradePlanMgeList.pas
@ -14,7 +14,8 @@ uses
  Data.Win.ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, Datasnap.DBClient,
  cxCheckBox, cxButtonEdit, cxSplitter, dxCore, cxDateUtils, cxMaskEdit,
  cxDropDownEdit, cxProgressBar, Vcl.Menus, RM_Common, RM_Class, RM_GridReport,
-  RM_Dataset, cxLookAndFeelPainters, Vcl.ExtCtrls, RM_e_Xls;
+  RM_Dataset, cxLookAndFeelPainters, Vcl.ExtCtrls, RM_e_Xls,
  dxLayoutControlAdapters, Vcl.StdCtrls;
 type
  TfrmTradePlanMgeList = class(TfrmBaseList)
@ -227,6 +228,9 @@ type
    Tv1Column14: TcxGridDBColumn;
    batchNo: TcxTextEdit;
    dxLayoutItem_batchno: TdxLayoutItem;
    btn1: TToolButton;
    dxLayoutItem3: TdxLayoutItem;
    TimeType: TComboBox;
    procedure TBCloseClick(Sender: TObject);
    procedure FormCreate(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
@ -265,6 +269,7 @@ type
    procedure v1ConNoPropertiesEditValueChanged(Sender: TObject);
    procedure ToolButton3Click(Sender: TObject);
    procedure TBJYbuttonClick(Sender: TObject);
    procedure btn1Click(Sender: TObject);
  private
    canshu1, canshu2: string;
    fIsLoad: Boolean;
@ -289,6 +294,83 @@ uses
  U_UptPlanDataToRoll, U_PictureUpload, U_PlanDR, U_MdPrint;
 {$R *.dfm}
 procedure TfrmTradePlanMgeList.btn1Click(Sender: TObject);
 var
  WSql, FFiltration1: string;
  fPrintFile, fPrintFile10, FMainID, LBName: string;
 begin
  if Order_Main.IsEmpty then
    Exit;
 //  if Order_Main.Locate('SSel', True, []) = False then
 //  begin
 //    Application.MessageBox('没有选择数据', '提示', 0);
 //    Exit;
 //  end;
  ExportFtErpFile('验货分析报告1.rmf', ADOQueryBaseCmd);
  FFiltration1 := Trim(Order_Main.fieldbyname('mainId').AsString);
  Order_Main.EnableControls;
  with ADO_1 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''A'' ');
    Open;
  end;
  with ADO_2 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''B'' ');
    Open;
  end;
  with ADO_3 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''C'' ');
    Open;
  end;
  with ADO_4 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''D'' ');
    Open;
  end;
  with ADO_5 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''D/C'' ');
    Open;
  end;
  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\验货分析报告1.rmf';
  RMXLSExport1.ShowDialog := true;
  if FileExists(fPrintFile) then
  begin
    RM2.LoadFromFile(fPrintFile);
    RM2.DefaultCopies := 1;
    RM2.ShowReport;
 //      RM1.PrintReport;
  end
  else
  begin
    Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
  end;
 end;
 procedure TfrmTradePlanMgeList.btnCopyClick(Sender: TObject);
 begin
  if cxPageControl1.ActivePageIndex = 0 then
@ -1065,6 +1147,8 @@ begin
    sql.Clear;
    sql.Add('Update Trade_Plan_Sub Set Averagetime =''' + trim(mvalues) + ''' ');
    sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');
    sql.Add('Update Trade_Cloth_Inspect Set Averagetime =''' + trim(mvalues) + ''' ');
    sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');
 //        showmessage(sql.text);
    ExecSQL;
  end;
@ -1091,6 +1175,8 @@ begin
    sql.Clear;
    sql.Add('Update Trade_Plan_SUB Set C_EName =''' + trim(mvalues) + ''' ');
    sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');
    sql.Add('Update Trade_Cloth_Inspect Set C_EName =''' + trim(mvalues) + ''' ');
    sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');
 //    showmessage(sql.text);
    ExecSQL;
  end;
@ -1149,7 +1235,7 @@ begin
      begin
        close;
        sql.Clear;
-        sql.Add('update  Trade_Plan_Main SET status=''10'' ');
+        sql.Add('update  Trade_Plan_Main SET status=''10'',Comptime = GETDATE()');
        sql.Add('where mainID=' + quotedstr(Trim(Order_Main.fieldbyname('mainID').AsString)));
        sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
@ -1229,6 +1315,8 @@ begin
    sql.Clear;
    sql.Add('Update Trade_Plan_Sub Set ConNo =''' + trim(mvalues) + ''' ');
    sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');
    sql.Add('Update Trade_Cloth_Inspect Set ConNo =''' + trim(mvalues) + ''' ');
    sql.Add('where Mainid=''' + Trim(Order_Main.fieldbyname('Mainid').AsString) + '''');
    ExecSQL;
  end;
@ -1365,7 +1453,7 @@ begin
      Filtered := false;
      sql.Clear;
      sql.Add('exec P_View_TradePlanList_for_pack :timeType, :begdate,:enddate,:mStatus,:WSql');
-      Parameters.ParamByName('timeType').Value := '制单日期';
+      Parameters.ParamByName('timeType').Value := TimeType.Text;
      Parameters.ParamByName('begdate').Value := FormatDateTime('yyyy-MM-dd', begdate.Date);
      Parameters.ParamByName('enddate').Value := FormatDateTime('yyyy-MM-dd', endDate.Date + 1);
      Parameters.ParamByName('mStatus').Value := mStatus;
--- a/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local
+++ b/项目代码/wenshangkm/G01贸易生产计划/djdPackPlan.dproj.local
@ -101,12 +101,12 @@
 	<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.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.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.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.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.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.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.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.720,=D:\Dp10RepoV1\项目代码\D10DJkaimengwenshang\项目代码\wenshangkm\A00通用窗体\U_MdPrint.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.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas</Transaction>
  </Transactions>
 </BorlandProject>
--- a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local
+++ b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.dproj.local
@ -1,104 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.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.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.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.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</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.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.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.pas=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.pas</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.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj</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.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.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.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.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.294,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.612,=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.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.663,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.dfm=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.dfm</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.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.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.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.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.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj</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.294,=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.230,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</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.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</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.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj</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.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm</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.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.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.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</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.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.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.717,=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.706,=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.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.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.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.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.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.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贸易布匹检验\U_frameBads.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</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.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</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.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.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.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.dfm=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.dfm</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.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas</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.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</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.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.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.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.717,=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.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</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.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm</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.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.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.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm</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.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm</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.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas</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.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.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.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.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.679,=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.233,=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.701,=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贸易布匹检验\U_DjdDjClList.pas=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.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.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClListJT.pas=D:\Dp10RepoV1\项目代码\D10djdPackwenshang\项目代码\wenshangkm\G03贸易布匹检验\U_DjdDjClList.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="android-support-v4.dex.jar"/>
--- a/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache
+++ b/项目代码/wenshangkm/G03贸易布匹检验/DjdMachineInsp.identcache
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.dfm
@ -37,7 +37,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    OnDblClick = dxLayoutControl_packDblClick
    object Button_set: TButton
      Left = 240
-      Top = -20
+      Top = 10
      Width = 51
      Height = 33
      Caption = #35774#32622
@ -52,7 +52,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object Piece: TcxTextEdit
      Left = 241
-      Top = 104
+      Top = 134
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -61,7 +61,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object Qty: TcxTextEdit
      Left = 90
-      Top = 104
+      Top = 134
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -70,7 +70,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object FtyPCId: TcxTextEdit
      Left = 90
-      Top = 79
+      Top = 109
      Properties.ReadOnly = False
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -80,7 +80,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object Color: TcxTextEdit
      Left = 241
-      Top = 54
+      Top = 84
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -89,7 +89,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object ColorNo: TcxTextEdit
      Left = 90
-      Top = 54
+      Top = 84
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -98,7 +98,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object CodeName: TcxTextEdit
      Left = 241
-      Top = 29
+      Top = 59
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -107,7 +107,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object OrderNo: TcxTextEdit
      Left = 90
-      Top = 29
+      Top = 59
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -116,7 +116,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object BCIOID: TcxTextEdit
      Left = 241
-      Top = 79
+      Top = 109
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -126,7 +126,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object InputLen: TcxTextEdit
      Tag = 999
      Left = 90
-      Top = 206
+      Top = 236
      AutoSize = False
      ParentFont = False
      Properties.ReadOnly = False
@ -147,7 +147,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object BTPrint: TButton
      Left = 259
-      Top = 328
+      Top = 358
      Width = 321
      Height = 59
      Caption = #25552'  '#20132
@ -162,7 +162,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object Button_bad: TButton
      Left = 300
-      Top = -20
+      Top = 10
      Width = 48
      Height = 33
      Caption = #30133#28857
@ -177,7 +177,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object btnRK: TButton
      Left = 357
-      Top = -20
+      Top = 10
      Width = 48
      Height = 33
      Caption = #20837#24211
@ -193,7 +193,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object Edit_pieceOrder: TcxTextEdit
      Tag = 999
      Left = 270
-      Top = 152
+      Top = 182
      AutoSize = False
      ParentFont = False
      Properties.ReadOnly = True
@ -213,7 +213,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object Edit_fixLen: TcxTextEdit
      Tag = 999
      Left = 343
-      Top = 152
+      Top = 182
      AutoSize = False
      ParentFont = False
      Properties.ReadOnly = False
@ -233,7 +233,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object Tare: TcxTextEdit
      Tag = 999
      Left = 158
-      Top = 328
+      Top = 358
      AutoSize = False
      ParentFont = False
      Properties.OnChange = InputLenPropertiesChange
@ -254,7 +254,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object Coefficient: TcxTextEdit
      Tag = 999
      Left = 90
-      Top = 396
+      Top = 426
      AutoSize = False
      ParentFont = False
      Properties.ReadOnly = False
@ -275,7 +275,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object InputWeight: TcxTextEdit
      Tag = 999
      Left = 90
-      Top = 328
+      Top = 358
      AutoSize = False
      ParentFont = False
      Properties.OnChange = InputLenPropertiesChange
@ -295,7 +295,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object BatchNO: TcxTextEdit
      Left = 90
-      Top = 152
+      Top = 182
      AutoSize = False
      Properties.ReadOnly = False
      Style.HotTrack = False
@ -308,7 +308,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object PieceNo: TcxTextEdit
      Left = 183
-      Top = 152
+      Top = 182
      AutoSize = False
      Properties.ReadOnly = True
      Style.HotTrack = False
@ -322,8 +322,8 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object OutPutWeight: TcxTextEdit
      Tag = 999
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      AutoSize = False
      ParentFont = False
      Style.Font.Charset = ANSI_CHARSET
@ -343,7 +343,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object edtPacketNo: TcxTextEdit
      Left = 409
-      Top = 152
+      Top = 182
      AutoSize = False
      ParentFont = False
      Style.Font.Charset = ANSI_CHARSET
@ -362,7 +362,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object AOrdDefNote1: TcxRichEdit
      Left = 0
-      Top = 450
+      Top = 480
      ParentFont = False
      Properties.ReadOnly = True
      Properties.ScrollBars = ssBoth
@ -379,8 +379,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 181
    end
    object cxDBImage1: TcxDBImage
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Hint = 'FileName'
      DataBinding.DataField = 'FilesOther'
      DataBinding.DataSource = DS_IMAGE
@ -397,7 +397,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object grade: TcxComboBox
      Left = 517
-      Top = 206
+      Top = 236
      AutoSize = False
      ParentFont = False
      Properties.DropDownListStyle = lsEditFixedList
@ -423,7 +423,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object btnUnRk: TButton
      Left = 414
-      Top = -20
+      Top = 10
      Width = 81
      Height = 33
      Caption = #25764#20837#24211
@ -438,7 +438,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object Btn_rlBill: TButton
      Left = 504
-      Top = -20
+      Top = 10
      Width = 64
      Height = 33
      Caption = #20837#24211#21333
@ -454,7 +454,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object lblRuleConversion: TcxComboBox
      Tag = 2
      Left = 140
-      Top = 396
+      Top = 426
      AutoSize = False
      ParentFont = False
      Properties.DropDownListStyle = lsEditFixedList
@ -484,7 +484,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object packnote: TcxMemo
      Tag = 999
      Left = 190
-      Top = 450
+      Top = 480
      ParentFont = False
      Properties.ReadOnly = True
      Properties.ScrollBars = ssVertical
@ -503,7 +503,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    object edtScan: TcxTextEdit
      Tag = 999
      Left = 71
-      Top = -20
+      Top = 10
      ParentFont = False
      Properties.CharCase = ecUpperCase
      Style.Font.Charset = ANSI_CHARSET
@ -529,8 +529,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 149
    end
    object C_Pattern: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -539,8 +539,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 124
    end
    object RuleYardstick: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      AutoSize = False
      ParentFont = False
      Properties.ReadOnly = True
@ -561,8 +561,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 69
    end
    object C_StyleNo: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      ParentFont = False
      Properties.ReadOnly = True
      Style.HotTrack = False
@ -573,7 +573,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object packPostBtn: TButton
      Left = 460
-      Top = 396
+      Top = 426
      Width = 120
      Height = 37
      Caption = #25171#21253#25552#20132
@ -587,8 +587,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      OnClick = packPostBtnClick
    end
    object customStrField1: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 47
@ -597,8 +597,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object customStrField2: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 48
@ -607,8 +607,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object C_Width: TcxTextEdit
-      Left = 8466
+      Left = 8097
-      Top = 9946
+      Top = 9914
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 49
@ -617,8 +617,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object C_GramWeight: TcxTextEdit
-      Left = 8466
+      Left = 8097
-      Top = 9946
+      Top = 9914
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 50
@ -627,8 +627,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object addLen: TcxTextEdit
-      Left = 7868
+      Left = 7499
-      Top = 9946
+      Top = 9914
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 51
@ -637,8 +637,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object addWet: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 52
@ -647,8 +647,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object bt_printmd: TButton
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Width = 48
      Height = 33
      Caption = #30721#21333
@ -663,8 +663,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      OnClick = bt_printmdClick
    end
    object presentLen: TcxTextEdit
-      Left = 10000
+      Left = 9631
-      Top = 9970
+      Top = 9938
      Properties.OnChange = presentLenPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -674,8 +674,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object presentWeight: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 55
@ -684,8 +684,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object unitPieces: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 56
@ -694,8 +694,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object custName: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -704,8 +704,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 164
    end
    object customStrField3: TcxComboBox
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 58
@ -714,8 +714,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 145
    end
    object c_ecolor: TcxTextEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -725,8 +725,8 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object edit_roll_auto: TcxTextEdit
      Tag = 999
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      AutoSize = False
      ParentFont = False
      Properties.ReadOnly = True
@ -745,8 +745,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 20
    end
    object customStrField4: TcxButtonEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Hint = 'customStrField4/'#33258#23450#20041'4'
      Properties.Buttons = <
        item
@ -762,8 +762,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object customStrField8: TcxButtonEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Hint = 'customStrField8/'#33258#23450#20041'8'
      Properties.Buttons = <
        item
@ -779,8 +779,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object customStrField7: TcxButtonEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Hint = 'customStrField7/'#33258#23450#20041'7'
      Properties.Buttons = <
        item
@ -796,8 +796,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object customStrField6: TcxButtonEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Hint = 'customStrField6/'#33258#23450#20041'6'
      Properties.Buttons = <
        item
@ -813,8 +813,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object customStrField5: TcxButtonEdit
-      Left = 5468
+      Left = 5099
-      Top = 9885
+      Top = 9853
      Hint = 'customStrField5/'#33258#23450#20041'5'
      Properties.Buttons = <
        item
@ -832,7 +832,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object InspectionType: TcxComboBox
      Left = 517
-      Top = 288
+      Top = 318
      Properties.DropDownRows = 10
      Properties.Items.Strings = (
        #26816#39564
@ -851,8 +851,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 63
    end
    object topLen: TcxTextEdit
-      Left = 8399
+      Left = 8030
-      Top = 9946
+      Top = 9914
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 69
@ -861,8 +861,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object midLen: TcxTextEdit
-      Left = 8399
+      Left = 8030
-      Top = 9946
+      Top = 9914
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 70
@ -871,8 +871,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object lastLen: TcxTextEdit
-      Left = 8399
+      Left = 8030
-      Top = 9946
+      Top = 9914
      AutoSize = False
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -884,7 +884,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object Cause: TcxTextEdit
      Left = 834
-      Top = 206
+      Top = 236
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 36
@ -893,7 +893,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object Radio_banci: TRadioGroup
      Left = 220
-      Top = 206
+      Top = 236
      Width = 73
      Height = 105
      Caption = #29677#27425
@ -905,10 +905,11 @@ inherited frmMachRollMain: TfrmMachRollMain
      ParentBackground = False
      ParentColor = False
      TabOrder = 22
      OnClick = Radio_banciClick
    end
    object BanciqtyA: TcxTextEdit
-      Left = 7868
+      Left = 7499
-      Top = 9946
+      Top = 9914
      AutoSize = False
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -919,8 +920,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object BanciqtyC: TcxTextEdit
-      Left = 7868
+      Left = 7499
-      Top = 9946
+      Top = 9914
      AutoSize = False
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -931,8 +932,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 121
    end
    object BanciqtyB: TcxTextEdit
-      Left = 7868
+      Left = 7499
-      Top = 9946
+      Top = 9914
      AutoSize = False
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -944,7 +945,8 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object AFiller: TcxTextEdit
      Left = 667
-      Top = 206
+      Top = 236
      Properties.OnChange = AFillerPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 33
@ -953,7 +955,8 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object BFiller: TcxTextEdit
      Left = 667
-      Top = 240
+      Top = 270
      Properties.OnChange = BFillerPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 34
@ -962,7 +965,8 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object CFiller: TcxTextEdit
      Left = 667
-      Top = 274
+      Top = 304
      Properties.OnChange = CFillerPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
      TabOrder = 35
@ -971,7 +975,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object edtMaBiao: TcxTextEdit
      Left = 288
-      Top = 396
+      Top = 426
      AutoSize = False
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -983,7 +987,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object EDIT_Machi: TcxTextEdit
      Left = 394
-      Top = 396
+      Top = 426
      AutoSize = False
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -994,7 +998,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object hundredsquare: TLabel
      Left = 302
-      Top = 206
+      Top = 236
      Width = 90
      Height = 19
      Caption = #30334#24179#26041#31859#20998#25968
@ -1003,7 +1007,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object ActualLen: TcxTextEdit
      Left = 90
-      Top = 284
+      Top = 314
      AutoSize = False
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -1014,7 +1018,7 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object Sampling: TcxTextEdit
      Left = 90
-      Top = 250
+      Top = 280
      Properties.OnChange = SamplingPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
@ -2024,11 +2028,9 @@ inherited frmMachRollMain: TfrmMachRollMain
      Left = 1
      Top = 151
      Width = 291
-      Height = 100
+      Height = 196
      Align = alClient
      TabOrder = 0
      ExplicitTop = 121
      ExplicitHeight = 130
      object Tv3: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
@ -2101,7 +2103,7 @@ inherited frmMachRollMain: TfrmMachRollMain
        OptionsView.Footer = True
        OptionsView.GroupByBox = False
        object v3PieceNo: TcxGridDBColumn
-          Caption = #21367#21495
+          Caption = #24207#21495
          DataBinding.FieldName = 'PieceNo'
          DataBinding.IsNullValueType = True
          FixedKind = fkLeftDynamic
@ -2109,13 +2111,22 @@ inherited frmMachRollMain: TfrmMachRollMain
          Options.Editing = False
          Width = 38
        end
        object tv3CIID: TcxGridDBColumn
          Caption = #21367#21495
          DataBinding.FieldName = 'BCIOID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Sorting = False
          Width = 80
        end
        object Tv3Meter: TcxGridDBColumn
          Caption = #31859#25968
          DataBinding.FieldName = 'Meter'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
-          Width = 55
+          Width = 53
        end
        object Tv3Yardage: TcxGridDBColumn
          Caption = #30721#25968
@ -2123,7 +2134,7 @@ inherited frmMachRollMain: TfrmMachRollMain
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
-          Width = 55
+          Width = 53
        end
        object v3NetWeight: TcxGridDBColumn
          Caption = #20928#37325
@ -2151,7 +2162,7 @@ inherited frmMachRollMain: TfrmMachRollMain
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
-          Width = 40
+          Width = 36
        end
        object Tv3PacketNo: TcxGridDBColumn
          Caption = #21253#21495
@ -2162,14 +2173,6 @@ inherited frmMachRollMain: TfrmMachRollMain
          Options.Editing = False
          Width = 40
        end
        object Tv3BatchNO: TcxGridDBColumn
          Caption = #26412#21378#32568#21495
          DataBinding.FieldName = 'BatchNO'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 90
        end
        object Tv3AddLenPresent: TcxGridDBColumn
          Caption = #20943#38271
          DataBinding.FieldName = 'AddLenPresent'
@ -2178,14 +2181,13 @@ inherited frmMachRollMain: TfrmMachRollMain
          Options.Editing = False
          Width = 57
        end
-        object tv3CIID: TcxGridDBColumn
+        object Tv3BatchNO: TcxGridDBColumn
-          Caption = #21367#26465#30721
+          Caption = #26412#21378#32568#21495
-          DataBinding.FieldName = 'CIID'
+          DataBinding.FieldName = 'BatchNO'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
-          Options.Sorting = False
+          Width = 90
          Width = 66
        end
        object Tv3FtyPCId: TcxGridDBColumn
          Caption = #32568#21495
@ -2244,14 +2246,14 @@ inherited frmMachRollMain: TfrmMachRollMain
    object cxPageControl1: TcxPageControl
      Tag = 999
      Left = 1
-      Top = 251
+      Top = 347
      Width = 291
-      Height = 484
+      Height = 388
      Align = alBottom
      TabOrder = 1
      Properties.ActivePage = cxTabSheet1
      Properties.CustomButtons.Buttons = <>
-      ClientRectBottom = 484
+      ClientRectBottom = 388
      ClientRectRight = 291
      ClientRectTop = 32
      object cxTabSheet1: TcxTabSheet
@ -2262,7 +2264,7 @@ inherited frmMachRollMain: TfrmMachRollMain
          Left = 0
          Top = 0
          Width = 291
-          Height = 452
+          Height = 356
          Align = alClient
          TabOrder = 0
          object Tv2: TcxGridDBTableView
@ -2398,7 +2400,7 @@ inherited frmMachRollMain: TfrmMachRollMain
          Left = 0
          Top = 0
          Width = 291
-          Height = 452
+          Height = 356
          Align = alClient
          TabOrder = 0
          object TV1: TcxGridDBTableView
@ -2438,7 +2440,7 @@ inherited frmMachRollMain: TfrmMachRollMain
              HeaderAlignmentHorz = taCenter
              Options.Focusing = False
              Options.Sorting = False
-              Width = 95
+              Width = 66
            end
            object cxGridDBColumn3: TcxGridDBColumn
              Caption = #20301#32622#36215
@ -2448,7 +2450,7 @@ inherited frmMachRollMain: TfrmMachRollMain
              HeaderAlignmentHorz = taCenter
              HeaderGlyphAlignmentHorz = taCenter
              Options.Sorting = False
-              Width = 104
+              Width = 54
            end
            object cxGridDBColumn4: TcxGridDBColumn
              Caption = #20301#32622#27490
@ -2456,7 +2458,7 @@ inherited frmMachRollMain: TfrmMachRollMain
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
              HeaderGlyphAlignmentHorz = taCenter
-              Width = 76
+              Width = 53
            end
            object cxGridDBColumn5: TcxGridDBColumn
              Caption = #38271#24230
@ -2465,7 +2467,7 @@ inherited frmMachRollMain: TfrmMachRollMain
              PropertiesClassName = 'TcxTextEditProperties'
              HeaderAlignmentHorz = taCenter
              Options.Sorting = False
-              Width = 72
+              Width = 42
            end
            object cxGridDBColumn6: TcxGridDBColumn
              Caption = #21407#22240
@ -2488,7 +2490,7 @@ inherited frmMachRollMain: TfrmMachRollMain
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
              Options.Editing = False
-              Width = 77
+              Width = 41
            end
            object cxGridDBColumn9: TcxGridDBColumn
              Caption = #20010#25968
@ -2496,7 +2498,7 @@ inherited frmMachRollMain: TfrmMachRollMain
              DataBinding.IsNullValueType = True
              HeaderAlignmentHorz = taCenter
              Options.Editing = False
-              Width = 67
+              Width = 48
            end
            object TV1SubtractQty: TcxGridDBColumn
              Caption = #20943#21435#25968#37327
@ -2643,8 +2645,8 @@ inherited frmMachRollMain: TfrmMachRollMain
      end
    end
    object Panel_msg: TPanel
-      Left = 9
+      Left = 34
-      Top = 347
+      Top = 189
      Width = 241
      Height = 41
      Caption = #20877#27425#28857#20462#25913#21487#20197#35299#38500#20462#25913#25552#20132
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_MachRollMain.pas
@ -365,6 +365,10 @@ type
    procedure ToolButton2Click(Sender: TObject);
    procedure presentLenPropertiesChange(Sender: TObject);
    procedure SamplingPropertiesChange(Sender: TObject);
    procedure Radio_banciClick(Sender: TObject);
    procedure AFillerPropertiesChange(Sender: TObject);
    procedure BFillerPropertiesChange(Sender: TObject);
    procedure CFillerPropertiesChange(Sender: TObject);
  private
    FCIID, FOperationStatus, FCIFName, FWorkshop: string;
    FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@ -477,6 +481,10 @@ begin
  end;
  hundredsquare.Caption := '百平方米疵点' + floattostr(FCDfs);
  if FCDfs = 0 then
  begin
    GRade.text := 'A';
  end;
  if FCDfs <= 20 then
  begin
    GRade.text := 'A';
@ -550,7 +558,10 @@ begin
    edtScan.SetFocus;
    if trim(OrderNo.Text) = '' then
    begin
      Application.MessageBox('请扫描二维码!', '提示', 0);
      exit;
    end;
    if (grade.ItemIndex = -1) and (trim(grade.Text) = '') then      //trim(grade.Text) = ''
    begin
      Application.MessageBox('等级不能为空!', '提示', 0);
@ -616,8 +627,8 @@ begin
        cds_params.Post;
        edtPacketNo.Enabled := true;
 //        Panel_msg.Visible := true;
-        if fileexists(ExtractFilePath(Application.ExeName) + 'ÐÞ¸Ä³É¹¦.wav') then
+        if fileexists(ExtractFilePath(Application.ExeName) + '正确.wav') then
-          playSound(pwidechar('ÐÞ¸Ä³É¹¦.wav'), 0, SND_FILENAME or SND_ASYNC);
+          playSound(pwidechar('正确.wav'), 0, SND_FILENAME or SND_ASYNC);
      end
      else
      begin
@ -1174,6 +1185,11 @@ begin
  cxGroupBox_keys.Visible := false;
 end;
 procedure TfrmMachRollMain.CFillerPropertiesChange(Sender: TObject);
 begin
  InitJYGrid();
 end;
 function TfrmMachRollMain.CheckData(CKType: string): Boolean;
 var
  mvalue: double;
@ -1351,6 +1367,11 @@ begin
 end;
 procedure TfrmMachRollMain.Radio_banciClick(Sender: TObject);
 begin
  InitJYGrid();
 end;
 procedure TfrmMachRollMain.InitPlan(MSubID: string);
 begin
  fCanAutoPost := false;
@ -1605,7 +1626,7 @@ end;
 procedure TfrmMachRollMain.Label2Click(Sender: TObject);
 begin
-  Cause.text := trim(Radio_Cause.Caption);
+  Cause.text := trim(Radio_Cause.Items[Radio_Cause.ItemIndex]);
 //  trIM(edit_Cause.text);
  cxGroupBox1.Visible := false;
 end;
@ -1717,7 +1738,11 @@ procedure TfrmMachRollMain.ToolButton2Click(Sender: TObject);
 begin
  if CDS_3.IsEmpty then
    Exit;
-
+  if FBCIOID <> cds_3.fieldbyName('BCIOID').AsString then
  begin
    Application.MessageBox('请选择正确的条码进行重验!', '提示', 0);
    exit;
  end;
  with ADOQueryBaseCmd do
  begin
    Close;
@ -1725,9 +1750,11 @@ begin
    sql.add('insert into Trade_Cloth_Inspect_Flaw_del select * from Trade_Cloth_Inspect_Flaw  where CIID=''' + trim(cds_3.fieldbyName('CIID').AsString) + '''');
    SQL.Add('delete from Trade_Cloth_Inspect_Flaw  ');
    SQL.Add(' where CIID=''' + trim(cds_3.fieldbyName('CIID').AsString) + '''  ');
    Sql.Add('update Trade_Cloth_Inspect set FlawList = '''' where CIID=''' + trim(cds_3.fieldbyName('CIID').AsString) + '''');
    execsql;
  end;
  InitCDGridCX(cds_3.fieldbyName('CIID').AsString);
  InitCDGrid(cds_3.fieldbyName('CIID').AsString);
  gethundredsquares();
 end;
@ -1881,6 +1908,13 @@ procedure TfrmMachRollMain.TCPClick(Sender: TObject);
 //  CPciid: string;
 begin
 //  CPciid := trim(CDS_3.fieldbyName('CIID').AsString);
  if CDS_3.IsEmpty then
    Exit;
  if FBCIOID <> cds_3.fieldbyName('BCIOID').AsString then
  begin
    Application.MessageBox('请选择正确的条码进行拆匹!', '提示', 0);
    exit;
  end;
  with ADOQueryBaseCmd do
  begin
    close;
@ -1897,6 +1931,11 @@ procedure TfrmMachRollMain.TeditClick(Sender: TObject);
 begin
  if cds_3.IsEmpty then
    exit;
  if FBCIOID <> cds_3.fieldbyName('BCIOID').AsString then
  begin
    Application.MessageBox('请选择正确的条码进行修改!', '提示', 0);
    exit;
  end;
 //  Panel_msg.Visible := not Panel_msg.Visible;
  cxgrid3.Enabled := not cxgrid3.Enabled;
  InitJTM(cds_3.fieldbyName('CIID').AsString);
@ -1910,7 +1949,10 @@ begin
    PieceNo.Text := fieldbyName('PieceNo').AsString;
    InputWeight.Text := fieldbyName('InputWeight').AsString;
    Tare.Text := fieldbyName('Tare').AsString;
-    grade.ItemIndex := grade.Properties.Items.IndexOf(trim(fieldbyName('grade').AsString));
+    if trim(fieldbyName('grade').AsString) = '' then
      grade.text := 'A'
    else
      grade.ItemIndex := grade.Properties.Items.IndexOf(trim(fieldbyName('grade').AsString));
    Coefficient.Text := fieldByName('Coefficient').AsString;
    Radio_banci.ItemIndex := Radio_banci.Items.IndexOf(trim(fieldbyName('banci').AsString));
    InspectionType.ItemIndex := InspectionType.Properties.Items.IndexOf(trim(fieldbyName('InspectionType').AsString));
@ -2248,8 +2290,29 @@ begin
      Close;
      SQL.Clear;
      SQL.Add('select A.*');
-      SQL.Add('from Trade_Cloth_Inspect A where BCIOID=''' + trim(FBCIOID) + '''');
+      SQL.Add('from Trade_Cloth_Inspect A');     // where BCIOID=''' + trim(FBCIOID) + ''''
-      SQL.Add('order by filltime desc');
+      SQL.Add('WHERE ( CAST(DATEADD(MI, -480, Edittime) AS DATE) = CAST(DATEADD(MI, -480, GETDATE()) AS DATE)');
      if Radio_banci.ItemIndex <> -1 then
      begin
        Sql.Add('AND banci = ''' + Radio_banci.Items[Radio_banci.ItemIndex] + '''');
      end;
      if (AFiller.Text <> '') and (Radio_banci.ItemIndex = 0) then
      begin
        Sql.Add('and AFiller = ''' + AFiller.Text + '''');
      end;
      if (BFiller.Text <> '') and (Radio_banci.ItemIndex = 1) then
      begin
        Sql.Add('and BFiller = ''' + BFiller.Text + '''');
      end;
      if (CFiller.Text <> '') and (Radio_banci.ItemIndex = 2) then
      begin
        Sql.Add('and CFiller = ''' + CFiller.Text + '''');
      end;
      Sql.Add(')');
      Sql.Add('OR BCIOID=''' + trim(FBCIOID) + '''');
      SQL.Add('order by CASE WHEN BCIOID = ''' + trim(FBCIOID) + '''' + ' THEN 0 ELSE 1 END, Edittime desc');
 //      showmessage(sql.Text);
      Open;
    end;
    SCreateCDS(ADOQueryMain, cds_3);
@ -2724,7 +2787,10 @@ begin
    if trim(edtScan.Text) = '' then
      exit;
    if trim(edtScan.Text) = FBCIOID then
    begin
      edtScan.Text := '';
      exit;
    end;
    ClearGlobal();
    FOperationStatus := '缸条码';
    // InitLCK(edtScan.Text);
@ -2892,7 +2958,7 @@ begin
      end
      else
      begin
-        MYardage := RoundFloat((MActualLen + maddLen ) * (mYardStick / 100), cds_params.fieldbyName('YPlace').AsInteger);
+        MYardage := RoundFloat((MActualLen + maddLen) * (mYardStick / 100), cds_params.fieldbyName('YPlace').AsInteger);
        MMeter := RoundFloat(MYardage * 0.9144, cds_params.fieldbyName('MPlace').AsInteger);
      end;
@ -3335,6 +3401,11 @@ end;
 //
 procedure TfrmMachRollMain.AFillerPropertiesChange(Sender: TObject);
 begin
  InitJYGrid();
 end;
 procedure TfrmMachRollMain.BadSpeedButtonClick(Sender: TObject);
 var
  i: Integer;
@ -3363,6 +3434,11 @@ begin
 end;
 procedure TfrmMachRollMain.BFillerPropertiesChange(Sender: TObject);
 begin
  InitJYGrid();
 end;
 procedure TfrmMachRollMain.On1301(var Message: Tmessage);
 var
  i1, i2: Integer;
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.dfm
@ -13,13 +13,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
  TextHeight = 21
  object Panel6: TPanel [0]
    Left = 0
-    Top = 146
+    Top = 130
    Width = 1353
    Height = 40
    Align = alTop
    AutoSize = True
    BevelInner = bvLowered
    TabOrder = 3
    ExplicitTop = 146
    DesignSize = (
      1353
      40)
@ -556,10 +557,10 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
    Left = 0
    Top = 0
    Width = 1353
-    Height = 76
+    Height = 60
    AutoSize = True
-    ButtonHeight = 38
+    ButtonHeight = 30
-    ButtonWidth = 169
+    ButtonWidth = 131
    Caption = 'ToolBar1'
    Color = clWhite
    DoubleBuffered = False
@ -579,7 +580,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      OnClick = TBRafreshClick
    end
    object btnJBQ: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #25171#21360#21367#26631#31614
@ -590,7 +591,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      OnClick = btnJBQClick
    end
    object ToolButton3: TToolButton
-      Left = 213
+      Left = 179
      Top = 0
      AutoSize = True
      Caption = #25171#21360#21253#26631#31614
@ -599,7 +600,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      OnClick = ToolButton3Click
    end
    object btnEdit: TToolButton
-      Left = 332
+      Left = 278
      Top = 0
      AutoSize = True
      Caption = #32534#36753
@ -607,7 +608,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      OnClick = btnEditClick
    end
    object ToolButton6: TToolButton
-      Left = 403
+      Left = 341
      Top = 0
      AutoSize = True
      Caption = #20462#25913#24179#22343#26102#38388
@ -615,7 +616,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      OnClick = ToolButton6Click
    end
    object ToolButton2: TToolButton
-      Left = 538
+      Left = 452
      Top = 0
      AutoSize = True
      Caption = #25209#37327#20462#25913
@ -624,7 +625,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      Style = tbsDropDown
    end
    object TBZF: TToolButton
-      Left = 664
+      Left = 556
      Top = 0
      AutoSize = True
      Caption = #21024#38500
@ -632,29 +633,29 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      OnClick = TBZFClick
    end
    object Tout: TToolButton
-      Left = 735
+      Left = 619
      Top = 0
      AutoSize = True
      Caption = #20986#24211
      DropdownMenu = PopupMenu1
      ImageIndex = 49
      Wrap = True
      Style = tbsDropDown
      Visible = False
      OnClick = ToutClick
    end
    object Tunout: TToolButton
-      Left = 0
+      Left = 699
-      Top = 38
+      Top = 0
      AutoSize = True
      Caption = #25764#38144#20986#24211
      ImageIndex = 11
      Wrap = True
      Visible = False
      OnClick = TunoutClick
    end
    object ToolButton4: TToolButton
-      Left = 103
+      Left = 0
-      Top = 38
+      Top = 30
      AutoSize = True
      Caption = #25171#21253
      ImageIndex = 34
@ -662,8 +663,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      OnClick = ToolButton4Click
    end
    object btnJYBG: TToolButton
-      Left = 174
+      Left = 63
-      Top = 38
+      Top = 30
      AutoSize = True
      Caption = #26816#39564#25253#21578
      ImageIndex = 21
@ -671,48 +672,55 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      OnClick = btnJYBGClick
    end
    object Tprintmd: TToolButton
-      Left = 277
+      Left = 150
-      Top = 38
+      Top = 30
      AutoSize = True
      Caption = #25171#21360#30721#21333
      ImageIndex = 21
      OnClick = TprintmdClick
    end
    object ToolButton7: TToolButton
-      Left = 380
+      Left = 237
-      Top = 38
+      Top = 30
      AutoSize = True
-      Caption = #25171#21360#39564#36135#20998#26512#25253#21578
+      Caption = #23548#20986#39564#36135#20998#26512#25253#21578
      ImageIndex = 21
      OnClick = ToolButton7Click
    end
    object btn1: TToolButton
      Left = 372
      Top = 30
      Caption = #25171#21360#39564#36135#20998#26512#25253#21578
      ImageIndex = 21
      OnClick = btn1Click
    end
    object TBExport: TToolButton
-      Left = 547
+      Left = 503
-      Top = 38
+      Top = 30
      AutoSize = True
      Caption = #23548#20986
      ImageIndex = 20
      OnClick = TBExportClick
    end
    object ToolButton5: TToolButton
-      Left = 618
+      Left = 566
-      Top = 38
+      Top = 30
      AutoSize = True
      Caption = #26085#24535
      ImageIndex = 9
      OnClick = ToolButton5Click
    end
    object ToolButton1: TToolButton
-      Left = 689
+      Left = 629
-      Top = 38
+      Top = 30
      AutoSize = True
      Caption = #20445#23384#26684#24335
      ImageIndex = 16
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 792
+      Left = 716
-      Top = 38
+      Top = 30
      AutoSize = True
      Caption = #20851#38381
      ImageIndex = 7
@ -738,13 +746,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
  end
  object dxLayoutControl_query: TdxLayoutControl [4]
    Left = 0
-    Top = 76
+    Top = 60
    Width = 1353
    Height = 70
    Align = alTop
    TabOrder = 4
    AutoSize = True
    LayoutLookAndFeel = DataLink_TradeInsp.dxLayoutSkinLookAndFeel1
    ExplicitTop = 76
    object OrderNo: TcxTextEdit
      Tag = 2
      Left = 491
@ -970,9 +979,9 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
      Width = 85
      Height = 29
      TabOrder = 1
-      Text = #25171#30721#26085#26399
+      Text = #23548#20837#26085#26399
      Items.Strings = (
-        #25171#30721#26085#26399
+        #23548#20837#26085#26399
        #26816#39564#26085#26399
        '')
    end
--- a/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas
+++ b/项目代码/wenshangkm/G03贸易布匹检验/U_TradeClothInspList.pas
@ -187,6 +187,7 @@ type
    endTime: TDateTimePicker;
    dxLayoutItem20: TdxLayoutItem;
    TimeType: TComboBox;
    btn1: TToolButton;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
@ -237,6 +238,7 @@ type
    procedure v1sselPropertiesEditValueChanged(Sender: TObject);
    procedure cxCheckBox1Click(Sender: TObject);
    procedure ToolButton7Click(Sender: TObject);
    procedure btn1Click(Sender: TObject);
  private
    fstopwatch: TStopwatch;
    DQdate: TDateTime;
@ -424,6 +426,104 @@ begin
  selDisp();
 end;
 procedure TfrmTradeClothInspList.btn1Click(Sender: TObject);
 var
  WSql, FFiltration1: string;
  fPrintFile, fPrintFile10, FMainID, LBName: string;
 begin
  if Order_Main.IsEmpty then
    Exit;
  if Order_Main.Locate('SSel', True, []) = False then
  begin
    Application.MessageBox('没有选择数据', '提示', 0);
    Exit;
  end;
  ExportFtErpFile('验货分析报告1.rmf', ADOQueryTemp);
  WSql := '';
  Order_Main.DisableControls;
  with Order_Main do
  begin
    First;
    while not Eof do
    begin
      if Order_Main.fieldbyname('SSel').AsBoolean then
      begin
        if WSql <> '' then
        begin
          WSql := WSql + ',' + Trim(Order_Main.fieldbyname('CIID').AsString);
        end
        else
        begin
          WSql := Trim(Order_Main.fieldbyname('CIID').AsString);
        end;
      end;
      Next;
    end;
  end;
  Order_Main.Locate('SSel', True, []);
  FFiltration1 := WSql;
  Order_Main.EnableControls;
  with ADO_1 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''A'' ');
    Open;
  end;
  with ADO_2 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''B'' ');
    Open;
  end;
  with ADO_3 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''C'' ');
    Open;
  end;
  with ADO_4 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''D'' ');
    Open;
  end;
  with ADO_5 do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX1');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    sql.add(',@grade=''D/C'' ');
    Open;
  end;
  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\验货分析报告1.rmf';
  RMXLSExport1.ShowDialog := true;
  if FileExists(fPrintFile) then
  begin
    RM2.LoadFromFile(fPrintFile);
    RM2.DefaultCopies := 1;
    RM2.ShowReport;
 //      RM1.PrintReport;
  end
  else
  begin
    Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
  end;
 end;
 procedure TfrmTradeClothInspList.btnEditClick(Sender: TObject);
 begin
  if Order_Main.IsEmpty then
@ -795,7 +895,7 @@ begin
  with frmSysLogList do
  begin
    fModel := self.caption;
-    FMainId := ''; // Trim(Self.Order_Main.FieldByName('mainId').AsString);
+    FMainID := ''; // Trim(Self.Order_Main.FieldByName('mainId').AsString);
    showmodal;
    free;
  end;
@ -891,6 +991,20 @@ begin
  Order_Main.Locate('SSel', True, []);
  FFiltration1 := WSql;
  Order_Main.EnableControls;
  with ADOQueryCmd do
  begin
    Close;
    sql.Clear;
    sql.add('exec P_Trade_Cloth_IN_djd_Prt_JYFX_DCFS');
    sql.add(' @Filtration=' + quotedstr(Trim(FFiltration1)));
    Open;
  end;
  if ADOQueryCmd.FieldByName('PS').asfloat > 0 then
  begin
    Application.MessageBox('本次选中数据有疵点分大于本卷米长的4倍的数据！', '提示', 0);
  end;
  with ADO_1 do
  begin
    Close;