diff --git a/T03贸易布匹检验/TradeInspFile.INI b/T03贸易布匹检验/TradeInspFile.INI
index 91b0629..8063b4a 100644
--- a/T03贸易布匹检验/TradeInspFile.INI
+++ b/T03贸易布匹检验/TradeInspFile.INI
@@ -14,8 +14,8 @@
 ÖØÁ¿ÏÂÏÞ=0
 ÖØÁ¿ÉÏÏÞ=222
 Ã×ÊýСÊýλ=0
-ÂëÊýСÊýλ=0
-ÖØÁ¿Ð¡Êýλ=0
+ÂëÊýСÊýλ=2
+ÖØÁ¿Ð¡Êýλ=1
 ×Ô¶¨Òå×Öĸ¼ü1=A
 ×Ô¶¨Òå×Öĸ¼ü2=-
 
diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm
index ebe4feb..48b469d 100644
--- a/T03贸易布匹检验/U_MachRollMain.dfm
+++ b/T03贸易布匹检验/U_MachRollMain.dfm
@@ -2354,11 +2354,9 @@
           OnClick = FrameKeyBoard1SpeedButton1Click
         end
         inherited SpeedButton5: TSpeedButton
-          Left = 58
-          Top = 59
+          Top = 62
           OnClick = FrameKeyBoard1SpeedButton1Click
-          ExplicitLeft = 58
-          ExplicitTop = 59
+          ExplicitTop = 62
         end
         inherited SpeedButton8: TSpeedButton
           OnClick = FrameKeyBoard1SpeedButton1Click
diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas
index 0705d3c..50af2dc 100644
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas
@@ -448,7 +448,7 @@ begin
       Application.MessageBox('¸ÃÑÕɫδÔÚ´ý¼ì²¼²Ö¿â£¬²»¿ÉÒÔ¼ìÑé¸ÃÑÕÉ«£¡', 'ÌáʾÐÅÏ¢', MB_ICONERROR);
       exit;
     end;
-    if ((trim(Coefficient.text) = '') and ((trim(lblRuleConversion.text) = 'ÎÞÐèת»»') or (trim(lblRuleConversion.text) = '')))  or (trim(C_Width.text) = '') or (trim(C_GramWeight.text) = '') then
+    if ((trim(Coefficient.text) = '') and ((trim(lblRuleConversion.text) = 'ÎÞÐèת»»') or (trim(lblRuleConversion.text) = ''))) or (trim(C_Width.text) = '') or (trim(C_GramWeight.text) = '') then
     begin
       with ADOCmd do
       begin
@@ -2559,15 +2559,17 @@ begin
   end;
 //  if not cds_params.IsEmpty then
 //  begin
-  cds_params.Edit;
+
   with cds_params do
   begin
+    cds_params.Edit;
     if Trim(edtMaBiao.Text) = '¡Ì' then
       cds_params.fieldByName('mabiao').Value := '1'
     else
       cds_params.fieldByName('mabiao').Value := '0';
+    cds_params.Post;
   end;
-  cds_params.Post;
+
 //  end;
 end;
 
@@ -3236,10 +3238,18 @@ begin
   frameBads1.lblCIFName.Caption := trim(TSpeedButton(Sender).Hint);
 
   frameBads1.CIFNumber.SetFocus;
+
   frameBads1.CIFNumber.text := '1';
-  frameBads1.CIFBeg.text := trim(Self.InputLen.text);
+//  frameBads1.CIFBeg.text := trim(Self.InputLen.text);
   frameBads1cxCheckBox_readLenPropertiesChange(frameBads1.IsSubtract);
 
+  frameBads1.cxCheck_len.Checked := true;
+  if frameBads1.cxCheck_len.Checked and (trim(InputLen.Text) <> '') then
+  begin
+    frameBads1.CIFBeg.Text := trim(InputLen.Text);
+    frameBads1.CIFEnd.SetFocus;
+  end;
+
 end;
 
 procedure TfrmMachRollMain.On1301(var Message: Tmessage);
diff --git a/T03贸易布匹检验/U_ProductListHelp.dfm b/T03贸易布匹检验/U_ProductListHelp.dfm
index b2af0cd..fb0abe6 100644
--- a/T03贸易布匹检验/U_ProductListHelp.dfm
+++ b/T03贸易布匹检验/U_ProductListHelp.dfm
@@ -398,7 +398,7 @@ inherited frmProductListHelp: TfrmProductListHelp
       AllowRemove = False
       CaptionOptions.Text = #35746#21333#21495
       Control = OrderNo
-      ControlOptions.OriginalHeight = 33
+      ControlOptions.OriginalHeight = 21
       ControlOptions.OriginalWidth = 109
       ControlOptions.ShowBorder = False
       Index = 2
@@ -408,7 +408,7 @@ inherited frmProductListHelp: TfrmProductListHelp
       AllowRemove = False
       CaptionOptions.Text = #23458#25143#21517#31216
       Control = custName
-      ControlOptions.OriginalHeight = 33
+      ControlOptions.OriginalHeight = 21
       ControlOptions.OriginalWidth = 109
       ControlOptions.ShowBorder = False
       Index = 3
@@ -416,7 +416,7 @@ inherited frmProductListHelp: TfrmProductListHelp
     object dxLayoutItem_color: TdxLayoutItem
       CaptionOptions.Text = #39068#33394
       Control = C_Color
-      ControlOptions.OriginalHeight = 33
+      ControlOptions.OriginalHeight = 21
       ControlOptions.OriginalWidth = 121
       ControlOptions.ShowBorder = False
       Index = -1
@@ -436,8 +436,8 @@ inherited frmProductListHelp: TfrmProductListHelp
       SizeOptions.Width = 197
       CaptionOptions.Text = #21046#21333#26085#26399
       Control = begdate
-      ControlOptions.OriginalHeight = 33
-      ControlOptions.OriginalWidth = 133
+      ControlOptions.OriginalHeight = 21
+      ControlOptions.OriginalWidth = 138
       ControlOptions.ShowBorder = False
       Index = 0
     end
@@ -446,8 +446,8 @@ inherited frmProductListHelp: TfrmProductListHelp
       SizeOptions.Width = 152
       CaptionOptions.Text = '--'
       Control = enddate
-      ControlOptions.OriginalHeight = 33
-      ControlOptions.OriginalWidth = 117
+      ControlOptions.OriginalHeight = 21
+      ControlOptions.OriginalWidth = 133
       ControlOptions.ShowBorder = False
       Index = 1
     end
@@ -455,7 +455,7 @@ inherited frmProductListHelp: TfrmProductListHelp
       Parent = dxLayoutControl_queryGroup_Root
       CaptionOptions.Text = #21512#21516#21495
       Control = conNo
-      ControlOptions.OriginalHeight = 33
+      ControlOptions.OriginalHeight = 21
       ControlOptions.OriginalWidth = 105
       ControlOptions.ShowBorder = False
       Index = 4
@@ -463,7 +463,7 @@ inherited frmProductListHelp: TfrmProductListHelp
     object dxLayoutItem_khdh: TdxLayoutItem
       CaptionOptions.Text = #23458#25143#21333#21495
       Control = BuyConNo
-      ControlOptions.OriginalHeight = 33
+      ControlOptions.OriginalHeight = 21
       ControlOptions.OriginalWidth = 121
       ControlOptions.ShowBorder = False
       Index = -1
@@ -471,7 +471,7 @@ inherited frmProductListHelp: TfrmProductListHelp
     object dxLayoutItem_Pattern: TdxLayoutItem
       CaptionOptions.Text = #33457#22411
       Control = C_Pattern
-      ControlOptions.OriginalHeight = 33
+      ControlOptions.OriginalHeight = 21
       ControlOptions.OriginalWidth = 121
       ControlOptions.ShowBorder = False
       Index = -1
diff --git a/T03贸易布匹检验/U_ProductListHelp.pas b/T03贸易布匹检验/U_ProductListHelp.pas
index 809ec39..10cdc93 100644
--- a/T03贸易布匹检验/U_ProductListHelp.pas
+++ b/T03贸易布匹检验/U_ProductListHelp.pas
@@ -13,7 +13,8 @@ uses
   Vcl.ToolWin, Data.Win.ADODB, U_BaseHelp, U_BaseList, System.ImageList,
   Vcl.ImgList, Datasnap.DBClient, dxBarBuiltInMenu, cxGridCustomPopupMenu,
   cxGridPopupMenu, dxLayoutContainer, dxLayoutControl, cxContainer, dxCore,
-  cxDateUtils, dxLayoutcxEditAdapters, cxMaskEdit, cxDropDownEdit, cxTextEdit;
+  cxDateUtils, dxLayoutcxEditAdapters, cxMaskEdit, cxDropDownEdit, cxTextEdit,
+  dxSkinsCore;
 
 type
   TfrmProductListHelp = class(TfrmBaseHelp)
@@ -94,7 +95,7 @@ procedure TfrmProductListHelp.FormCreate(Sender: TObject);
 begin
   inherited;
   cxGrid2.Align:=alClient;
-  BegDate.Date:=SGetServerDateTime(ADOQueryBaseTemp)-3;
+  BegDate.Date:=SGetServerDateTime(ADOQueryBaseTemp)-30;
   endDate.Date:=SGetServerDateTime(ADOQueryBaseTemp)
 end;