diff --git a/T03贸易布匹检验/DjdMachineInsp.identcache b/T03贸易布匹检验/DjdMachineInsp.identcache
index 515b0c2..415d003 100644
Binary files a/T03贸易布匹检验/DjdMachineInsp.identcache and b/T03贸易布匹检验/DjdMachineInsp.identcache differ
diff --git a/T03贸易布匹检验/File.INI b/T03贸易布匹检验/File.INI
index 9e94d39..235b02c 100644
--- a/T03贸易布匹检验/File.INI
+++ b/T03贸易布匹检验/File.INI
@@ -1,5 +1,5 @@
 [Éú²ú³µ¼äÅäÖÃ]
-»ų́±êÖ¾=1
+»ų́±êÖ¾=99
 ³ÉÆ·DLLÎļþ=TradeManagePB.dll
 ³ÉÆ·DLLµ÷ÓúÅ=3
 Ô±¹¤±àºÅ=select distinct UserID from SY_Purview where ModuleId='15' and ModuleSubId='04'
\ No newline at end of file
diff --git a/T03贸易布匹检验/TradeInspFile.INI b/T03贸易布匹检验/TradeInspFile.INI
index e5ca417..7397ced 100644
--- a/T03贸易布匹检验/TradeInspFile.INI
+++ b/T03贸易布匹检验/TradeInspFile.INI
@@ -7,12 +7,13 @@
 Âë±íµ÷ÓÃDllÎļþ=
 ÆôÓÃÂë±íDllÎļþ=1
 ÆôÓÃÂë±íµ¥Î»=1
-±êÇ©·ÝÊý=2
+´ò°ü=
+±êÇ©·ÝÊý=1
 Ã×ÊýÏÂÏÞ=0
 Ã×ÊýÉÏÏÞ=100
 ÖØÁ¿ÏÂÏÞ=0
 ÖØÁ¿ÉÏÏÞ=222
-Ã×ÊýСÊýλ=1
+Ã×ÊýСÊýλ=0
 ÂëÊýСÊýλ=1
 ÖØÁ¿Ð¡Êýλ=1
 ×Ô¶¨Òå×Öĸ¼ü1=A
diff --git a/T03贸易布匹检验/U_MachRollMain.dfm b/T03贸易布匹检验/U_MachRollMain.dfm
index 63327fa..0c694c1 100644
--- a/T03贸易布匹检验/U_MachRollMain.dfm
+++ b/T03贸易布匹检验/U_MachRollMain.dfm
@@ -49,7 +49,7 @@
       OnClick = Button_setClick
     end
     object Piece: TcxTextEdit
-      Left = 236
+      Left = 260
       Top = 141
       Properties.ReadOnly = True
       Style.HotTrack = False
@@ -58,16 +58,16 @@
       Width = 164
     end
     object Qty: TcxTextEdit
-      Left = 74
+      Left = 83
       Top = 114
       Properties.ReadOnly = True
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 8
-      Width = 116
+      Width = 131
     end
     object Color: TcxTextEdit
-      Left = 236
+      Left = 260
       Top = 87
       Properties.ReadOnly = True
       Style.HotTrack = False
@@ -76,16 +76,16 @@
       Width = 164
     end
     object ColorNo: TcxTextEdit
-      Left = 74
+      Left = 83
       Top = 87
       Properties.ReadOnly = True
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 7
-      Width = 116
+      Width = 131
     end
     object CodeName: TcxTextEdit
-      Left = 236
+      Left = 260
       Top = 60
       Properties.ReadOnly = True
       Style.HotTrack = False
@@ -94,16 +94,16 @@
       Width = 164
     end
     object OrderNo: TcxTextEdit
-      Left = 74
+      Left = 83
       Top = 60
       Properties.ReadOnly = True
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 6
-      Width = 116
+      Width = 131
     end
     object BCIOID: TcxTextEdit
-      Left = 236
+      Left = 260
       Top = 114
       Properties.ReadOnly = True
       Style.HotTrack = False
@@ -136,7 +136,7 @@
     object BTPrint: TButton
       Left = 259
       Top = 298
-      Width = 140
+      Width = 335
       Height = 59
       Caption = #25552'  '#20132
       Font.Charset = GB2312_CHARSET
@@ -297,6 +297,7 @@
       Style.IsFontAssigned = True
       TabOrder = 14
       OnClick = edtScanEnter
+      OnExit = BatchNOExit
       OnKeyPress = InputLenKeyPress
       Height = 27
       Width = 53
@@ -316,7 +317,7 @@
     end
     object OutPutWeight: TcxTextEdit
       Tag = 999
-      Left = 9213
+      Left = 8864
       Top = 10000
       AutoSize = False
       ParentFont = False
@@ -328,7 +329,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 30
+      TabOrder = 34
       Visible = False
       OnClick = edtScanEnter
       OnKeyPress = InputLenKeyPress
@@ -356,7 +357,7 @@
     end
     object AOrdDefNote1: TcxRichEdit
       Left = 0
-      Top = 420
+      Top = 456
       ParentFont = False
       Properties.ReadOnly = True
       Properties.ScrollBars = ssBoth
@@ -368,12 +369,12 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 28
+      TabOrder = 32
       Height = 206
       Width = 181
     end
     object cxDBImage1: TcxDBImage
-      Left = 9213
+      Left = 8864
       Top = 10000
       Hint = 'FileName'
       DataBinding.DataField = 'FilesOther'
@@ -384,7 +385,7 @@
       Properties.ShowFocusRect = False
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 31
+      TabOrder = 35
       Visible = False
       Height = 122
       Width = 280
@@ -467,15 +468,15 @@
       StyleDisabled.LookAndFeel.SkinName = 'WXI'
       StyleFocused.LookAndFeel.SkinName = 'WXI'
       StyleHot.LookAndFeel.SkinName = 'WXI'
-      TabOrder = 26
+      TabOrder = 27
       Text = #26080#38656#36716#25442
       Height = 37
-      Width = 77
+      Width = 158
     end
     object packnote: TcxMemo
       Tag = 999
       Left = 190
-      Top = 420
+      Top = 456
       ParentFont = False
       Properties.ReadOnly = True
       Properties.ScrollBars = ssVertical
@@ -487,7 +488,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 29
+      TabOrder = 33
       Height = 206
       Width = 199
     end
@@ -520,18 +521,18 @@
       Width = 149
     end
     object C_Pattern: TcxTextEdit
-      Left = 9213
+      Left = 8864
       Top = 10000
       ParentFont = False
       Properties.ReadOnly = True
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 35
+      TabOrder = 39
       Visible = False
       Width = 124
     end
     object RuleYardstick: TcxTextEdit
-      Left = 9052
+      Left = 8703
       Top = 10000
       AutoSize = False
       ParentFont = False
@@ -544,7 +545,7 @@
       Style.HotTrack = False
       Style.TransparentBorder = False
       Style.IsFontAssigned = True
-      TabOrder = 36
+      TabOrder = 40
       Text = '100'
       Visible = False
       OnClick = edtScanEnter
@@ -553,19 +554,19 @@
       Width = 69
     end
     object C_StyleNo: TcxTextEdit
-      Left = 9213
+      Left = 8864
       Top = 10000
       Properties.ReadOnly = True
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 37
+      TabOrder = 41
       Visible = False
       Width = 168
     end
     object packPostBtn: TButton
-      Left = 226
+      Left = 307
       Top = 366
-      Width = 84
+      Width = 158
       Height = 37
       Caption = #25171#21253#25552#20132
       Font.Charset = GB2312_CHARSET
@@ -574,64 +575,22 @@
       Font.Name = #24494#36719#38597#40657
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 27
+      TabOrder = 29
       OnClick = packPostBtnClick
     end
     object customStrField1: TcxTextEdit
-      Left = 9213
+      Left = 8864
       Top = 10000
       Properties.ReadOnly = True
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 38
-      Visible = False
-      OnClick = edtScanEnter
-      Width = 121
-    end
-    object customStrField2: TcxTextEdit
-      Left = 9213
-      Top = 10000
-      Style.HotTrack = False
-      Style.TransparentBorder = False
-      TabOrder = 39
-      Visible = False
-      OnClick = edtScanEnter
-      Width = 121
-    end
-    object C_Width: TcxTextEdit
-      Left = 9213
-      Top = 10000
-      ParentFont = False
-      Style.HotTrack = False
-      Style.TransparentBorder = False
-      TabOrder = 40
-      Visible = False
-      OnClick = edtScanEnter
-      Width = 121
-    end
-    object C_GramWeight: TcxTextEdit
-      Left = 9213
-      Top = 10000
-      ParentFont = False
-      Style.HotTrack = False
-      Style.TransparentBorder = False
-      TabOrder = 41
-      Visible = False
-      OnClick = edtScanEnter
-      Width = 121
-    end
-    object addLen: TcxTextEdit
-      Left = 9213
-      Top = 10000
-      Style.HotTrack = False
-      Style.TransparentBorder = False
       TabOrder = 42
       Visible = False
       OnClick = edtScanEnter
       Width = 121
     end
-    object addWet: TcxTextEdit
-      Left = 9213
+    object customStrField2: TcxTextEdit
+      Left = 8864
       Top = 10000
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -640,8 +599,50 @@
       OnClick = edtScanEnter
       Width = 121
     end
+    object C_Width: TcxTextEdit
+      Left = 8864
+      Top = 10000
+      ParentFont = False
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 44
+      Visible = False
+      OnClick = edtScanEnter
+      Width = 121
+    end
+    object C_GramWeight: TcxTextEdit
+      Left = 8864
+      Top = 10000
+      ParentFont = False
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 45
+      Visible = False
+      OnClick = edtScanEnter
+      Width = 121
+    end
+    object addLen: TcxTextEdit
+      Left = 8864
+      Top = 10000
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 46
+      Visible = False
+      OnClick = edtScanEnter
+      Width = 121
+    end
+    object addWet: TcxTextEdit
+      Left = 8864
+      Top = 10000
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 47
+      Visible = False
+      OnClick = edtScanEnter
+      Width = 121
+    end
     object bt_printmd: TButton
-      Left = 9213
+      Left = 8864
       Top = 10000
       Width = 48
       Height = 33
@@ -652,58 +653,44 @@
       Font.Name = #24494#36719#38597#40657
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 44
+      TabOrder = 48
       Visible = False
       OnClick = bt_printmdClick
     end
     object presentLen: TcxTextEdit
-      Left = 9213
+      Left = 8864
       Top = 10000
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 45
+      TabOrder = 49
       Visible = False
       OnClick = edtScanEnter
       Width = 121
     end
     object presentWeight: TcxTextEdit
-      Left = 9213
+      Left = 8864
       Top = 10000
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 46
+      TabOrder = 50
       Visible = False
       OnClick = edtScanEnter
       Width = 121
     end
     object unitPieces: TcxTextEdit
-      Left = 9213
+      Left = 8864
       Top = 10000
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 47
+      TabOrder = 51
       Visible = False
       OnClick = edtScanEnter
       Width = 121
     end
-    object FtyPCId: TComboBox
-      Left = 69
-      Top = 141
-      Width = 121
-      Height = 35
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -20
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = [fsBold]
-      ParentFont = False
-      TabOrder = 9
-      OnChange = FtyPCIdChange
-    end
     object BAN: TSpeedButton
-      Left = 319
+      Left = 474
       Top = 366
-      Width = 80
+      Width = 120
       Height = 37
       Caption = #25171#26495#26631#31614
       Font.Charset = GB2312_CHARSET
@@ -724,6 +711,61 @@
       OnKeyPress = InputLenKeyPress
       Width = 35
     end
+    object FtyPCId: TcxTextEdit
+      Left = 93
+      Top = 141
+      AutoSize = False
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 9
+      Height = 37
+      Width = 121
+    end
+    object edtChen: TcxTextEdit
+      Left = 74
+      Top = 412
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 26
+      Text = #8730
+      OnClick = edtChenClick
+      Width = 57
+    end
+    object edtMaBiao: TcxTextEdit
+      Left = 177
+      Top = 412
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 28
+      Text = #8730
+      OnClick = edtMaBiaoClick
+      Width = 121
+    end
+    object outPage: TcxTextEdit
+      Left = 344
+      Top = 412
+      Style.HotTrack = False
+      Style.TransparentBorder = False
+      TabOrder = 30
+      Text = #8730
+      OnClick = outPageClick
+      Width = 121
+    end
+    object labNumber: TComboBox
+      Left = 511
+      Top = 412
+      Width = 83
+      Height = 27
+      ItemIndex = 0
+      TabOrder = 31
+      Text = '1'
+      OnChange = labNumberChange
+      Items.Strings = (
+        '1'
+        '2'
+        '3'
+        '4')
+    end
     object dxLayoutControl_packGroup_Root: TdxLayoutGroup
       AlignHorz = ahClient
       AlignVert = avTop
@@ -847,6 +889,7 @@
       SizeOptions.SizableVert = True
       SizeOptions.Width = 188
       Hidden = True
+      ItemIndex = 3
       ShowBorder = False
       UseIndent = False
       Index = 0
@@ -1199,7 +1242,7 @@
       Index = 0
     end
     object dxLayoutItem24: TdxLayoutItem
-      Parent = dxLayoutAutoCreatedGroup4
+      Parent = dxLayoutAutoCreatedGroup7
       AlignHorz = ahLeft
       AlignVert = avClient
       SizeOptions.AssignedValues = [sovSizableHorz, sovSizableVert]
@@ -1306,7 +1349,7 @@
       Index = 6
     end
     object dxLayoutItem14: TdxLayoutItem
-      Parent = dxLayoutAutoCreatedGroup4
+      Parent = dxLayoutAutoCreatedGroup9
       AlignVert = avClient
       SizeOptions.Width = 77
       CaptionOptions.Text = #31995#25968#36716#25442
@@ -1315,7 +1358,7 @@
       ControlOptions.OriginalHeight = 29
       ControlOptions.OriginalWidth = 77
       ControlOptions.ShowBorder = False
-      Index = 1
+      Index = 0
     end
     object dxLayoutAutoCreatedGroup4: TdxLayoutAutoCreatedGroup
       Parent = dxLayoutAutoCreatedGroup2
@@ -1360,7 +1403,7 @@
       Index = -1
     end
     object dxLayoutItem_packpost: TdxLayoutItem
-      Parent = dxLayoutAutoCreatedGroup4
+      Parent = dxLayoutAutoCreatedGroup10
       AlignHorz = ahClient
       AlignVert = avClient
       Visible = False
@@ -1372,7 +1415,7 @@
       ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 75
       ControlOptions.ShowBorder = False
-      Index = 2
+      Index = 0
     end
     object dxLayoutItem_customStrField1: TdxLayoutItem
       CaptionOptions.Text = #33258#23450#20041#36755#20837'1'
@@ -1455,18 +1498,8 @@
       ControlOptions.ShowBorder = False
       Index = -1
     end
-    object dxLayoutItem4: TdxLayoutItem
-      Parent = dxLayoutGroup_plan_1
-      AlignVert = avClient
-      CaptionOptions.Text = #26579#21378#32568#21495
-      Control = FtyPCId
-      ControlOptions.OriginalHeight = 27
-      ControlOptions.OriginalWidth = 145
-      ControlOptions.ShowBorder = False
-      Index = 3
-    end
     object dxLayoutItem20: TdxLayoutItem
-      Parent = dxLayoutAutoCreatedGroup4
+      Parent = dxLayoutAutoCreatedGroup8
       AlignHorz = ahClient
       AlignVert = avClient
       Visible = False
@@ -1478,7 +1511,7 @@
       ControlOptions.OriginalHeight = 22
       ControlOptions.OriginalWidth = 23
       ControlOptions.ShowBorder = False
-      Index = 3
+      Index = 0
     end
     object dxLayoutItem12: TdxLayoutItem
       Parent = dxLayoutGroup_do1
@@ -1489,6 +1522,74 @@
       ControlOptions.ShowBorder = False
       Index = 5
     end
+    object dxLayoutItem19: TdxLayoutItem
+      Parent = dxLayoutGroup_plan_1
+      AlignVert = avClient
+      CaptionOptions.Text = #26579#21378#32568#21495
+      Control = FtyPCId
+      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalWidth = 121
+      ControlOptions.ShowBorder = False
+      Index = 3
+    end
+    object dxLayoutItem_chen: TdxLayoutItem
+      Parent = dxLayoutAutoCreatedGroup7
+      SizeOptions.Width = 83
+      CaptionOptions.Text = #31216
+      Control = edtChen
+      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalWidth = 53
+      ControlOptions.ShowBorder = False
+      Index = 1
+    end
+    object dxLayoutItem4: TdxLayoutItem
+      Parent = dxLayoutAutoCreatedGroup9
+      CaptionOptions.Text = #30721#34920
+      Control = edtMaBiao
+      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalWidth = 121
+      ControlOptions.ShowBorder = False
+      Index = 1
+    end
+    object dxLayoutItem22: TdxLayoutItem
+      Parent = dxLayoutAutoCreatedGroup10
+      CaptionOptions.Text = #20986#32440
+      Control = outPage
+      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalWidth = 121
+      ControlOptions.ShowBorder = False
+      Index = 1
+    end
+    object dxLayoutItem23: TdxLayoutItem
+      Parent = dxLayoutAutoCreatedGroup8
+      AlignHorz = ahLeft
+      AlignVert = avTop
+      CaptionOptions.Text = #20221#25968
+      Control = labNumber
+      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalWidth = 83
+      ControlOptions.ShowBorder = False
+      Index = 1
+    end
+    object dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup
+      Parent = dxLayoutAutoCreatedGroup4
+      AlignHorz = ahLeft
+      Index = 0
+    end
+    object dxLayoutAutoCreatedGroup9: TdxLayoutAutoCreatedGroup
+      Parent = dxLayoutAutoCreatedGroup4
+      Index = 1
+    end
+    object dxLayoutAutoCreatedGroup8: TdxLayoutAutoCreatedGroup
+      Parent = dxLayoutAutoCreatedGroup4
+      AlignHorz = ahClient
+      Index = 3
+    end
+    object dxLayoutAutoCreatedGroup10: TdxLayoutAutoCreatedGroup
+      Parent = dxLayoutAutoCreatedGroup4
+      AlignHorz = ahClient
+      Index = 2
+    end
   end
   object Panel_right: TPanel [1]
     Left = 1037
@@ -1501,9 +1602,9 @@
     object cxGrid3: TcxGrid
       Tag = 9999
       Left = 1
-      Top = 121
+      Top = 151
       Width = 250
-      Height = 341
+      Height = 303
       Align = alClient
       TabOrder = 0
       object Tv3: TcxGridDBTableView
@@ -1716,6 +1817,20 @@
           HeaderAlignmentHorz = taCenter
           Width = 50
         end
+        object Tv3Column2: TcxGridDBColumn
+          Caption = #36873#20013
+          DataBinding.FieldName = 'ssel'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
+        object Tv3Column3: TcxGridDBColumn
+          DataBinding.FieldName = 'Bstatus'
+          DataBinding.IsNullValueType = True
+          Visible = False
+          Width = 20
+          IsCaptionAssigned = True
+        end
       end
       object cxGridLevel2: TcxGridLevel
         GridView = Tv3
@@ -1983,7 +2098,7 @@
       Left = 1
       Top = 1
       Width = 250
-      Height = 120
+      Height = 150
       AutoSize = True
       ButtonHeight = 30
       ButtonWidth = 115
@@ -2062,15 +2177,41 @@
         Caption = #34920#26684#21015#35774#32622
         ImageIndex = 16
       end
-      object ToolButton8: TToolButton
+      object ToolButton1: TToolButton
         Left = 119
         Top = 90
         AutoSize = True
+        Caption = #37325#26032#25171#21253
+        ImageIndex = 4
+        Wrap = True
+        OnClick = ToolButton1Click
+      end
+      object ToolButton2: TToolButton
+        Left = 0
+        Top = 120
+        AutoSize = True
+        Caption = #25764#38144#25171#21253
+        ImageIndex = 14
+        OnClick = ToolButton2Click
+      end
+      object ToolButton8: TToolButton
+        Left = 103
+        Top = 120
+        AutoSize = True
         Caption = #20851#38381
         ImageIndex = 7
         OnClick = ToolButton8Click
       end
     end
+    object cxSplitter1: TcxSplitter
+      Left = 1
+      Top = 454
+      Width = 250
+      Height = 8
+      HotZoneClassName = 'TcxMediaPlayer9Style'
+      AlignSplitter = salBottom
+      Control = cxPageControl1
+    end
   end
   object dxPanel_mid: TdxPanel [2]
     Left = 411
diff --git a/T03贸易布匹检验/U_MachRollMain.pas b/T03贸易布匹检验/U_MachRollMain.pas
index 7bfee7e..7e02c45 100644
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas
@@ -18,7 +18,7 @@ uses
   U_KeyBoard, cxGroupBox, cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel,
   RM_RichEdit, cxProgressBar, cxCurrencyEdit, dxSkinsCore, dxSkinWXI, frxBarcode,
   frxOLE, frxRich, frxClass, frxDBSet, frxTableObject, frxExportPPTX,
-  frxExportXLSX, frxExportBaseDialog, frxExportXLS, Vcl.Mask;
+  frxExportXLSX, frxExportBaseDialog, frxExportXLS, Vcl.Mask, cxSplitter;
 
 type
   TfrmMachRollMain = class(TfrmBaseList)
@@ -236,8 +236,6 @@ type
     unitPieces: TcxTextEdit;
     dxLayoutItem_unitPieces: TdxLayoutItem;
     Tv3unitPieces: TcxGridDBColumn;
-    FtyPCId: TComboBox;
-    dxLayoutItem4: TdxLayoutItem;
     frxXLSExport1: TfrxXLSExport;
     frxXLSXExport1: TfrxXLSXExport;
     frxPPTXExport1: TfrxPPTXExport;
@@ -255,6 +253,25 @@ type
     PlateNo: TcxTextEdit;
     dxLayoutItem12: TdxLayoutItem;
     Tv3Column1: TcxGridDBColumn;
+    ToolButton1: TToolButton;
+    ToolButton2: TToolButton;
+    Tv3Column2: TcxGridDBColumn;
+    dxLayoutItem19: TdxLayoutItem;
+    FtyPCId: TcxTextEdit;
+    Tv3Column3: TcxGridDBColumn;
+    cxSplitter1: TcxSplitter;
+    edtChen: TcxTextEdit;
+    dxLayoutItem_chen: TdxLayoutItem;
+    edtMaBiao: TcxTextEdit;
+    dxLayoutItem4: TdxLayoutItem;
+    outPage: TcxTextEdit;
+    dxLayoutItem22: TdxLayoutItem;
+    labNumber: TComboBox;
+    dxLayoutItem23: TdxLayoutItem;
+    dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup;
+    dxLayoutAutoCreatedGroup9: TdxLayoutAutoCreatedGroup;
+    dxLayoutAutoCreatedGroup8: TdxLayoutAutoCreatedGroup;
+    dxLayoutAutoCreatedGroup10: TdxLayoutAutoCreatedGroup;
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure Button_badClick(Sender: TObject);
@@ -300,13 +317,20 @@ type
     procedure dxLayoutControl_packDblClick(Sender: TObject);
     procedure FtyPCIdChange(Sender: TObject);
     procedure BANClick(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure BatchNOExit(Sender: TObject);
+    procedure edtChenClick(Sender: TObject);
+    procedure edtMaBiaoClick(Sender: TObject);
+    procedure outPageClick(Sender: TObject);
+    procedure labNumberChange(Sender: TObject);
   private
     FCIID, FOperationStatus, FCIFName, FWorkshop: string;
     FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
     FBatchNO, FLenUnit, FC_Code, FC_Name, FC_EName, FC_Spec, FC_Width, FC_GramWeight: string;
     FC_Color, FC_EColor, FC_ColorNo, FC_StyleNo, FC_Composition, FC_Pattern, FC_CustPattern, FC_ColorDepth: string;
     Faddwet, faddlen: double;
-    FFtyPCId, FGangNo, FRulePieceNo, FCDUnit: string;
+    FFtyPCId, FGangNo, FRulePieceNo, FRulePackNo, FCDUnit: string;
     FPieceNo: Integer;
     fIsPack: string;
     fIsCommopen: Boolean;
@@ -343,6 +367,7 @@ type
     procedure On1301(var Message: Tmessage); message 1301; // Âë±í
     procedure initEditPiece();
     procedure GetPacketNo();
+    procedure GetRulePacketNo();
     procedure getPlanImage(MSubID: string);
     function deletePack(packId: string): boolean;
     function checkPicecNo(): boolean;
@@ -501,7 +526,8 @@ begin
             end;
             if (cds_params.fieldbyName('packlabnumber').AsInteger > 0) then
               PrintBao(MPacketId);
-            edtPacketNo.Text := inttostr(strtoint(edtPacketNo.Text) + 1);
+//            edtPacketNo.Text := inttostr(strtoint(edtPacketNo.Text) + 1);
+            GetRulePacketNo();
             FPacketCIID := '';
             FPacketCount := 0;
             ADOQueryBaseCmd.Connection.CommitTrans;
@@ -672,6 +698,48 @@ begin
 
 end;
 
+procedure TfrmMachRollMain.BatchNOExit(Sender: TObject);
+begin
+  if BTPrint.Caption = 'Ìá  ½»' then
+  begin
+    with ADOQueryBaseCmd do
+    begin
+      Close;
+      sql.Clear;
+      if FRulePieceNo = '°´¶©µ¥Éú³É' then
+      begin
+        sql.Add('select maxRoll=1+isnull(cast(max(PieceNo) as int),0) from Trade_Cloth_Inspect X where X.mainID=' + quotedstr(Trim(FMainId)));
+      end
+      else if FRulePieceNo = '°´¸×ºÅÉú³É' then
+      begin
+        sql.Add('select maxRoll=1+isnull(cast(max(PieceNo) as int),0)from Trade_Cloth_Inspect X ');
+        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and X.subid=''' + Trim(FSubId) + ''' and X.c_color=' + quotedstr(Trim(FC_Color)) + ' and isnull(X.BatchNO,'''')=' + quotedstr(Trim(BatchNO.Text)));
+
+      end
+      else if FRulePieceNo = '°´ÑÕÉ«Éú³É' then
+      begin
+        sql.Add('select maxRoll=1+isnull(cast(max(PieceNo) as int),0) from Trade_Cloth_Inspect X ');
+        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and  X.subid=''' + Trim(FSubId) + ''' and X.c_color=' + quotedstr(Trim(FC_Color)));
+
+      end
+      else if (FRulePieceNo = 'ÊÖ¶¯') or (FRulePieceNo = 'ÊÖ¶¯Éú³É') then
+      begin
+
+      end
+      else
+      begin
+        sql.Add('select maxRoll=1+isnull(cast(max(PieceNo) as int),0) ');
+        sql.Add('from Trade_Cloth_Inspect X where X.subID=''' + trim(FSubId) + ''' ');
+
+      end;
+      Open;
+    end;
+
+    PieceNo.Text := Trim(ADOQueryBaseCmd.fieldbyname('maxRoll').AsString);
+  end;
+
+end;
+
 procedure TfrmMachRollMain.btnRKClick(Sender: TObject);
 var
   MINo, MStkIds: string;
@@ -892,6 +960,19 @@ begin
     frameKeyBoard1.SpeedButton10.Visible := false;
   end;
   dxLayoutItem20.Visible := true;
+  if not cds_params.IsEmpty then
+  begin
+    cds_params.Edit;
+    with cds_params do
+    begin
+      cds_params.fieldByName('chen').Value := '1';
+      cds_params.fieldByName('mabiao').Value := '1';
+      cds_params.fieldByName('outPage').Value := '¡Ì';
+      cds_params.fieldByName('labNumber').Value := StrToIntDef(labNumber.Text, 1);
+    end;
+    cds_params.Post;
+  end;
+
 end;
 
 procedure TfrmMachRollMain.frameBads1CIFBegDblClick(Sender: TObject);
@@ -1035,7 +1116,7 @@ begin
       begin
         if strtointdef(edtPacketNo.Text, 0) = 0 then
           raise Exception.create('°üºÅ²»ÄÜΪ¿Õ!');
-        if cds_params.fieldbyName('packRolls').AsInteger = 0 then
+        if (cds_params.fieldbyName('packRolls').AsInteger = 0) and (trim(cds_params.fieldbyName('packNoMake').AsString) = '×Ô¶¯') then
           raise Exception.create('ÿ°ü¾íÊý»¹Î´ÉèÖÃ!');
 
       end;
@@ -1235,6 +1316,7 @@ begin
       customStrField1.Text := trim(fieldbyName('PO').AsString);
 //      FFtyPCId := trim(fieldbyName('FtyPCId').AsString);
       FRulePieceNo := trim(fieldbyName('RulePieceNo').AsString);
+      FRulePackNo := trim(fieldbyName('RulePackNo').AsString);
       //¼ÓÖØ
       Faddwet := fieldbyName('RuleAddwet').AsFloat;
       //¼Ó³¤
@@ -1261,7 +1343,7 @@ begin
         cds_params.fieldbyName('packNoMake').value := 'ÊÖ¶¯';
         cds_params.Post;
         dxLayoutItem_packno.Visible := true;
-        edtPacketNo.Text := '';
+//        edtPacketNo.Text := '';
       end;
       // ÿ°ü¾íÊý
       cds_params.edit;
@@ -1276,16 +1358,23 @@ begin
       begin
         cds_params.fieldbyName('dabao').value := '';
       end;
-      if fieldbyName('DecimalY').AsInteger > 0 then
-        cds_params.fieldbyName('Yplace').value := fieldbyName('DecimalY').AsInteger;
-      if fieldbyName('DecimalM').AsInteger > 0 then
-        cds_params.fieldbyName('MPlace').value := fieldbyName('DecimalM').AsInteger;
-      if fieldbyName('DecimalKg').AsInteger > 0 then
-        cds_params.fieldbyName('kgPlace').value := fieldbyName('DecimalKg').AsInteger;
+//      if fieldbyName('DecimalY').AsInteger > 0 then
+//        cds_params.fieldbyName('Yplace').value := fieldbyName('DecimalY').AsInteger;
+//      if fieldbyName('DecimalM').AsInteger > 0 then
+//        cds_params.fieldbyName('MPlace').value := fieldbyName('DecimalM').AsInteger;
+//      if fieldbyName('DecimalKg').AsInteger > 0 then
+//        cds_params.fieldbyName('kgPlace').value := fieldbyName('DecimalKg').AsInteger;
+      if ADOQueryBaseTemp.fieldbyName('DecimalY').AsInteger >= 0 then
+        cds_params.fieldbyName('Yplace').value := ADOQueryBaseTemp.fieldbyName('DecimalY').AsInteger;
+      if ADOQueryBaseTemp.fieldbyName('DecimalM').AsInteger >= 0 then
+        cds_params.fieldbyName('MPlace').value := ADOQueryBaseTemp.fieldbyName('DecimalM').AsInteger;
+      if ADOQueryBaseTemp.fieldbyName('DecimalKg').AsInteger >= 0 then
+        cds_params.fieldbyName('kgPlace').value := ADOQueryBaseTemp.fieldbyName('DecimalKg').AsInteger;
 
         //
       cds_params.fieldbyName('outPage').value := '¡Ì';
-
+      cds_params.fieldbyName('dabao').value := '¡Ì';
+      cds_params.fieldByName('packlabNumber').Value := '1';
       cds_params.Post;
       //
 //      BatchNO.Text := trim(fieldbyName('batchNo').AsString);
@@ -1352,13 +1441,13 @@ begin
     SQL.Add(')');
     open;
   end;
-  FtyPCId.Clear;
-  while not ADOQueryBaseCmd.Eof do
-  begin
-    FtyPCId.Items.Add(ADOQueryBaseCmd.FieldByName('FtyPCId').AsString);
-    ADOQueryBaseCmd.Next;
-  end;
-  FtyPCId.ItemIndex := 0;
+//  FtyPCId.Clear;
+//  while not ADOQueryBaseCmd.Eof do
+//  begin
+//    FtyPCId.Items.Add(ADOQueryBaseCmd.FieldByName('FtyPCId').AsString);
+//    ADOQueryBaseCmd.Next;
+//  end;
+//  FtyPCId.ItemIndex := 0;
   InitJYGrid();
 
   InitCDGrid(FCIID);
@@ -1389,6 +1478,21 @@ begin
   QuantityConversion();
 end;
 
+procedure TfrmMachRollMain.labNumberChange(Sender: TObject);
+begin
+  inherited;
+  if not cds_params.IsEmpty then
+  begin
+    cds_params.Edit;
+    with cds_params do
+    begin
+      cds_params.fieldByName('labNumber').Value := StrToIntDef(labNumber.Text, 1);
+    end;
+    cds_params.Post;
+  end;
+
+end;
+
 procedure TfrmMachRollMain.lblRuleConversionPropertiesChange(Sender: TObject);
 begin
   inherited;
@@ -1449,6 +1553,106 @@ begin
 
 end;
 
+procedure TfrmMachRollMain.ToolButton1Click(Sender: TObject);
+var
+  MPacketId, FCXPacketCIID: string;
+begin
+  if (trim(cds_params.fieldbyName('dabao').AsString) <> '¡Ì') then
+    exit;
+  try
+    packPostBtn.Enabled := false;
+    FCXPacketCIID := '';
+    with CDS_3 do
+    begin
+      First;
+      while not Eof do
+      begin
+        if CDS_3.FieldByName('ssel').AsBoolean = True then
+        begin
+          FCXPacketCIID := FCXPacketCIID + ',' + trim(cds_3.fieldbyName('CIID').AsString);
+
+        end;
+        Next;
+      end;
+      if GetLSNo(ADOQueryBaseTemp, MPacketId, 'BI', 'Trade_Cloth_Inspect', 4, 1) = false then
+      begin
+        Application.MessageBox('È¡°üÌõÂë×î´óºÅʧ°Ü£¡', 'Ìáʾ', 0);
+        exit;
+      end;
+    end;
+
+    try
+      ADOQueryBaseCmd.Connection.BeginTrans;
+      with ADOQueryBaseCmd do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('Update Trade_Cloth_Inspect Set PacketTime=GETDATE() , PacketNo=' + trim(edtPacketNo.Text) + ',PacketId=' + QuotedStr(trim(MPacketId)) + ',PacketCode=' + QuotedStr(trim(DCode)) + ',PacketName=' + QuotedStr(trim(DName)));
+        SQL.Add('WHERE EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + QuotedStr(FCXPacketCIID) + ','','') X where Trade_Cloth_Inspect.CIID=X.RTValue )  ');
+        SQL.Add('Update Bs_Cloth_IO Set PacketTime=GETDATE() , PacketNo=' + trim(edtPacketNo.Text) + ',PacketId=' + QuotedStr(trim(MPacketId)) + ',PacketCode=' + QuotedStr(trim(DCode)) + ',PacketName=' + QuotedStr(trim(DName)));
+        SQL.Add('WHERE EXISTS(select X.RTValue from [dbo].[F_Tool_SplitString](' + QuotedStr(FCXPacketCIID) + ','','') X where Bs_Cloth_IO.STKID=X.RTValue )  ');
+//      showmessage(SQL.text);
+        ExecSQL;
+      end;
+      if (cds_params.fieldbyName('packlabnumber').AsInteger > 0) then
+        PrintBao(MPacketId);
+//      edtPacketNo.Text := inttostr(strtoint(edtPacketNo.Text) + 1);
+      GetRulePacketNo();
+      FPacketCIID := '';
+      FPacketCount := 0;
+      ADOQueryBaseCmd.Connection.CommitTrans;
+            //
+      if fileexists(ExtractFilePath(Application.ExeName) + 'ÕýÈ·.wav') then
+        playSound(pwidechar('ÕýÈ·.wav'), 0, SND_FILENAME or SND_ASYNC);
+    except
+      ADOQueryBaseCmd.Connection.RollbackTrans;
+      Application.MessageBox('´ò°üʧ°Ü£¡', 'ÌáʾÐÅÏ¢', 0);
+    end;
+
+  finally
+    InitJYGrid();
+    packPostBtn.Enabled := true;
+  end;
+
+end;
+
+procedure TfrmMachRollMain.ToolButton2Click(Sender: TObject);
+var
+  cxPacketCIID: string;
+begin
+  if CDS_3.IsEmpty then
+    Exit;
+  if Application.MessageBox('È·¶¨Òª³·Ïú´ò°üÂð£¿', 'Ìáʾ', 32 + 4) <> IDYES then
+    Exit;
+  with CDS_3 do
+  begin
+    First;
+    while not Eof do
+    begin
+      if CDS_3.FieldByName('ssel').AsBoolean = True then
+      begin
+        with ADOCmd do
+        begin
+          Close;
+          sql.Clear;
+          SQL.Add('Update Trade_Cloth_Inspect Set PacketTime=null, PacketNo=null,PacketId=null,PacketCode=null,PacketName=null ');
+          SQL.Add('WHERE  CIID=' + QuotedStr(trim(cds_3.fieldbyName('CIID').AsString)));
+          SQL.Add('Update Bs_Cloth_IO Set  PacketTime=null, PacketNo=null,PacketId=null,PacketCode=null,PacketName=null ');
+          SQL.Add('WHERE  STKID=' + QuotedStr(trim(cds_3.fieldbyName('CIID').AsString)));
+          SQL.Add('insert into Trade_Need_Up(UType,UOperation,UDataId,uoperator) values(''¼ìÑé'',''¼ìÑéɾ³ý'',' + QuotedStr(trim(cds_3.fieldbyName('CIID').AsString)) + ',' + QuotedStr(DName) + ')  ');
+
+//    showmessage(sql.text);
+          execsql;
+        end;
+
+      end;
+      Next;
+    end;
+  end;
+
+  InitJYGrid();
+end;
+
 procedure TfrmMachRollMain.ToolButton3Click(Sender: TObject);
 begin
   if cds_3.IsEmpty then
@@ -1551,7 +1755,9 @@ end;
 
 procedure TfrmMachRollMain.Tv3CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 begin
-  if AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('Grade').Index] = '´ÎÆ·' then
+//  if AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('Grade').Index] = '´ÎÆ·' then
+//    ACanvas.Brush.Color := clRed;
+  if AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('Bstatus').Index] > 0 then
     ACanvas.Brush.Color := clRed;
 end;
 
@@ -1739,10 +1945,11 @@ begin
     else
       dxLayoutItem_packpost.Visible := false;
     //
-    if cds_3.IsEmpty then
-      edtPacketNo.Text := '1'
-    else
-      GetPacketNo();
+//    if cds_3.IsEmpty then
+//      edtPacketNo.Text := '1'
+//    else
+//      GetPacketNo();
+    GetRulePacketNo();
   end
   else
   begin
@@ -1859,7 +2066,7 @@ begin
     begin
       Close;
       SQL.Clear;
-      SQL.Add('select A.*');
+      SQL.Add('select A.*,Bstatus=(case when isnull(PacketNo,0)>0 then 1 else 0 end)');
       SQL.Add('from Trade_Cloth_Inspect A where BCIOID=''' + trim(FBCIOID) + '''');
       SQL.Add('order by filltime desc');
       Open;
@@ -1932,6 +2139,19 @@ begin
       Application.MessageBox('»¹Î´ÓÐÐèÒª´ò°üµÄ¾í£¡', 'Ìáʾ', 0);
       exit;
     end;
+    with ADOQuery1 do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('select isnull(count(*),0) as js from Trade_Cloth_Inspect where  PacketNo=''' + trim(edtPacketNo.Text) + ''' and  mainid='''+trim(Fmainid)+''' ');
+      open;
+    end;
+    if  ADOQuery1.fieldbyName('JS').AsInteger =1 then
+    begin
+      Application.MessageBox('°üºÅÖظ´£¬ÇëÖØдò°ü!', 'Ìáʾ', 0);
+      Exit;
+    end;
+
     if FPacketCount > 0 then
     begin
       if GetLSNo(ADOQueryBaseTemp, MPacketId, 'BI', 'Trade_Cloth_Inspect', 4, 1) = false then
@@ -1954,7 +2174,8 @@ begin
         end;
         if (cds_params.fieldbyName('packlabnumber').AsInteger > 0) then
           PrintBao(MPacketId);
-        edtPacketNo.Text := inttostr(strtoint(edtPacketNo.Text) + 1);
+//        edtPacketNo.Text := inttostr(strtoint(edtPacketNo.Text) + 1);
+        GetRulePacketNo();
         FPacketCIID := '';
         FPacketCount := 0;
         ADOQueryBaseCmd.Connection.CommitTrans;
@@ -2055,6 +2276,55 @@ begin
   cxPageControl1.ActivePageIndex := 0;
 end;
 
+procedure TfrmMachRollMain.edtChenClick(Sender: TObject);
+begin
+  inherited;
+  if trim(edtChen.Text) = '' then
+  begin
+    edtChen.Text := '¡Ì';
+  end
+  else
+  begin
+    edtChen.Text := '';
+  end;
+  if not cds_params.IsEmpty then
+  begin
+    cds_params.Edit;
+    with cds_params do
+    begin
+      if Trim(edtChen.Text) = '¡Ì' then
+        cds_params.fieldByName('chen').Value := '1'
+      else
+        cds_params.fieldByName('chen').Value := '0';
+
+    end;
+    cds_params.Post;
+  end;
+end;
+
+procedure TfrmMachRollMain.outPageClick(Sender: TObject);
+begin
+  inherited;
+  if trim(outPage.Text) = '' then
+  begin
+    outPage.Text := '¡Ì';
+  end
+  else
+  begin
+    outPage.Text := '';
+  end;
+  if not cds_params.IsEmpty then
+  begin
+    cds_params.Edit;
+    with cds_params do
+    begin
+    // ³öÖ½
+      cds_params.fieldByName('outPage').Value := outPage.Text;
+    end;
+    cds_params.Post;
+  end;
+end;
+
 procedure TfrmMachRollMain.dxLayoutControl_packDblClick(Sender: TObject);
 begin
   if gIsCanDesign then
@@ -2093,6 +2363,31 @@ begin
   // end;
 end;
 
+procedure TfrmMachRollMain.edtMaBiaoClick(Sender: TObject);
+begin
+  inherited;
+  if trim(edtMaBiao.Text) = '' then
+  begin
+    edtMaBiao.Text := '¡Ì';
+  end
+  else
+  begin
+    edtMaBiao.Text := '';
+  end;
+  if not cds_params.IsEmpty then
+  begin
+    cds_params.Edit;
+    with cds_params do
+    begin
+      if Trim(edtMaBiao.Text) = '¡Ì' then
+        cds_params.fieldByName('mabiao').Value := '1'
+      else
+        cds_params.fieldByName('mabiao').Value := '0';
+    end;
+    cds_params.Post;
+  end;
+end;
+
 procedure TfrmMachRollMain.Edit_pieceOrderClick(Sender: TObject);
 begin
   inherited;
@@ -2210,8 +2505,8 @@ begin
       begin
         MTare := strtofloatdef(trim(Tare.Text), 0); // ƤÖØ
         MInputWeight := RoundFloat(strtofloatdef(trim(InputWeight.Text), 0), cds_params.fieldbyName('KgPlace').AsInteger); //ÊäÈëΪ ëÖØ
-        MGrossWeight := MInputWeight + Maddwet; // ëÖØ + ¼ÓÖØ
-        MNetWeight := MInputWeight + Maddwet - MTare; // ¾»ÖØ + ¼ÓÖØ
+        MGrossWeight := MInputWeight + Maddwet + mpresentWeight; // ëÖØ + ¼ÓÖØ
+//        MNetWeight := MInputWeight + Maddwet - MTare; // ¾»ÖØ + ¼ÓÖØ
 //           MGrossWeight := MInputWeight + Maddwet + mpresentWeight; // ëÖØ + ¼ÓÖØ
         MNetWeight := MInputWeight + Maddwet - MTare + mpresentWeight; // ¾»ÖØ + ¼ÓÖØ
         fieldbyName('InputWeight').value := MInputWeight;
@@ -2505,6 +2800,7 @@ begin
       Close;
       SQL.Clear;
       SQL.Add('exec P_Trade_Insp_In_Stk @CIID=''' + trim(MCIID) + '''');
+//      ShowMessage(sql.Text);
       ExecSQL;
     end;
     // Open;
@@ -2637,8 +2933,8 @@ begin
     Open;
   end;
 
-  if trim(ADOQueryPrint.fieldbyName('SLabPackage').AsString) <> '' then
-    fLabPackage := trim(ADOQueryPrint.fieldbyName('SLabPackage').AsString)
+  if trim(ADOQueryPrint.fieldbyName('LabPackage').AsString) <> '' then
+    fLabPackage := trim(ADOQueryPrint.fieldbyName('LabPackage').AsString)
   else
     fLabPackage := ADOQueryPrint.fieldbyName('LabPackage').AsString;
 
@@ -2651,31 +2947,31 @@ begin
     Application.MessageBox(pchar('ûÓÐÕÒ°ü±êÇ©' + fPrintFile), 'Ìáʾ', 0);
     exit;
   end;
-//  if FileExists(fPrintFile) then
-//  begin
-//    RM1.LoadFromFile(fPrintFile);
-//    RM1.DefaultCopies := cds_params.fieldbyName('packlabnumber').AsInteger;
-//    if cds_params.fieldByName('packPrintPreview').AsBoolean then
-//      RM1.ShowReport
-//    else
-//      RM1.PrintReport;
-//  end;
   if FileExists(fPrintFile) then
   begin
-
-    frxReport1.LoadFromFile(fPrintFile);
-    frxReport1.PrintOptions.Copies := cds_params.fieldbyName('packlabnumber').AsInteger;
+    RM1.LoadFromFile(fPrintFile);
+    RM1.DefaultCopies := cds_params.fieldbyName('packlabnumber').AsInteger;
     if cds_params.fieldByName('packPrintPreview').AsBoolean then
-    begin
-      frxReport1.PrintOptions.ShowDialog := true;
-      frxReport1.ShowReport;
-    end
+      RM1.ShowReport
     else
-    begin
-      frxReport1.PrintOptions.ShowDialog := false;
-      frxReport1.PrepareReport(true);
-      frxReport1.Print();
-    end;
+      RM1.PrintReport;
+//  end;
+//  if FileExists(fPrintFile) then
+//  begin
+//
+//    frxReport1.LoadFromFile(fPrintFile);
+//    frxReport1.PrintOptions.Copies := cds_params.fieldbyName('packlabnumber').AsInteger;
+//    if cds_params.fieldByName('packPrintPreview').AsBoolean then
+//    begin
+//      frxReport1.PrintOptions.ShowDialog := true;
+//      frxReport1.ShowReport;
+//    end
+//    else
+//    begin
+//      frxReport1.PrintOptions.ShowDialog := false;
+//      frxReport1.PrepareReport(true);
+//      frxReport1.Print();
+//    end;
 
   end
   else
@@ -2773,9 +3069,31 @@ begin
 
   if (trim(cds_params.fieldbyName('mabiao').AsString) = '1') then
   begin
-    InputLen.Text := format('%.2f', [i1 / 100000]);
-    if trim(cds_params.fieldbyName('mbunit').AsString) = '1' then
+//    InputLen.Text := format('%.2f', [i1 / 100000]);
+//    if trim(cds_params.fieldbyName('mbunit').AsString) = '1' then
+//    begin
+//      if i2 = 0 then
+//      begin
+//        SetUnit('M');
+//      end
+//      else
+//      begin
+//        SetUnit('Y');
+//      end;
+//    end;
+    if (SCXFlag = '1') or (SCXFlag = '2') then
     begin
+      if frameBads1.lblLenUnit1.Caption = 'M' then
+      begin
+        InputLen.Text := format('%.' + trim(FMPlace) + 'f', [i1 / 100000]);
+      end
+      else
+        InputLen.Text := format('%.' + trim(FMPlace) + 'f', [i1 / 100000 / 0.9144]);
+    end
+    else
+    begin
+      InputLen.Text := format('%.' + trim(FMPlace) + 'f', [i1 / 100000]);
+
       if i2 = 0 then
       begin
         SetUnit('M');
@@ -2799,7 +3117,7 @@ begin
 
   if trim(cds_params.fieldbyName('chen').AsString) = '1' then
   begin
-    InputWeight.Text := format('%.2f', [i1 / 100000]);
+    InputWeight.Text := format('%.' + trim(FKgPlace) + 'f', [i1 / 100000]);
   end;
 
 end;
@@ -2892,6 +3210,68 @@ begin
 
 end;
 
+procedure TfrmMachRollMain.GetRulePacketNo();
+var
+  mMaxPacketNo: string;
+begin
+  try
+    if FRulePackNo = '°´¸×ºÅÉú³É' then
+    begin
+      with ADOQueryBaseTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('select max(cast(isnull(PacketNo,''0'') as int)  )+1  as MaxPacketNo from Trade_Cloth_Inspect X ');
+        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and X.subid=''' + Trim(FSubId) + ''' and X.c_color=' + quotedstr(Trim(FC_Color)) + ' and isnull(X.BatchNO,'''')=' + quotedstr(Trim(BatchNO.Text)));
+
+        Open;
+      end;
+    end
+    else if FRulePackNo = '°´¶©µ¥Éú³É' then
+    begin
+      with ADOQueryBaseTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('select max(cast(isnull(PacketNo,''0'') as int)  )+1  as MaxPacketNo from Trade_Cloth_Inspect X ');
+        SQL.Add('where X.mainID=''' + Trim(FMainId) + ''' and   OrderNo=' + QuotedStr(trim(OrderNo.Text)));
+        Open;
+      end;
+    end
+    else if FRulePackNo = '°´ÑÕÉ«Éú³É' then
+    begin
+      with ADOQueryBaseTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('select max(cast(isnull(PacketNo,''0'') as int)  )+1  as MaxPacketNo from Trade_Cloth_Inspect X ');
+        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and  X.subid=''' + Trim(FSubId) + ''' and X.c_color=' + quotedstr(Trim(FC_Color)));
+        Open;
+      end;
+    end
+    else
+    begin
+      with ADOQueryBaseTemp do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('select max(cast(isnull(PacketNo,''0'') as int)  )+1  as MaxPacketNo from Trade_Cloth_Inspect X ');
+        SQL.Add('where X.mainID=''' + Trim(FMainId) + ''' and   OrderNo=' + QuotedStr(trim(OrderNo.Text)));
+        Open;
+      end;
+    end;
+
+    mMaxPacketNo := trim(ADOQueryBaseTemp.fieldbyName('MaxPacketNo').AsString);
+    if mMaxPacketNo = '' then
+      mMaxPacketNo := '1';
+
+    edtPacketNo.Text := mMaxPacketNo;
+  except
+
+  end;
+
+end;
+
 procedure TfrmMachRollMain.getPlanImage(MSubID: string);
 begin
   with ADOQueryImage do
@@ -2986,13 +3366,13 @@ begin
       else if FRulePieceNo = '°´¸×ºÅÉú³É' then
       begin
         sql.Add('select mainId,C_color,batchNo,pieceNo from Trade_Cloth_Inspect X ');
-        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and X.c_color=' + quotedstr(Trim(FC_Color)) + ' and isnull(X.BatchNO,'''')=' + quotedstr(Trim(BatchNO.Text)));
+        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and X.subid=''' + Trim(FSubId) + ''' and X.c_color=' + quotedstr(Trim(FC_Color)) + ' and isnull(X.BatchNO,'''')=' + quotedstr(Trim(BatchNO.Text)));
         sql.Add(' Group by mainId,C_color,BatchNO,pieceNo having count(*)>1');
       end
       else if FRulePieceNo = '°´ÑÕÉ«Éú³É' then
       begin
         sql.Add('select mainId,C_color,pieceNo from Trade_Cloth_Inspect X ');
-        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and X.c_color=' + quotedstr(Trim(FC_Color)));
+        sql.Add('where X.mainID=''' + Trim(FMainId) + ''' and  X.subid=''' + Trim(FSubId) + ''' and X.c_color=' + quotedstr(Trim(FC_Color)));
         sql.Add(' Group by mainId,C_color,pieceNo having count(*)>1');
       end;
 
diff --git a/T03贸易布匹检验/U_ParamSet.dfm b/T03贸易布匹检验/U_ParamSet.dfm
index 89564a5..7ba6387 100644
--- a/T03贸易布匹检验/U_ParamSet.dfm
+++ b/T03贸易布匹检验/U_ParamSet.dfm
@@ -62,25 +62,25 @@ object frmParamSet: TfrmParamSet
           Visible = True
         end
         inherited edtMaBiao: TcxTextEdit
-          ExplicitHeight = 38
+          ExplicitHeight = 34
         end
         inherited edtMBDW: TcxTextEdit
-          ExplicitHeight = 38
+          ExplicitHeight = 34
         end
         inherited edtChen: TcxTextEdit
-          ExplicitHeight = 38
+          ExplicitHeight = 34
         end
         inherited outPage: TcxTextEdit
-          ExplicitHeight = 38
+          ExplicitHeight = 34
         end
         inherited AddwetPresent: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited AddLenPresent: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited presentNumFlag: TcxComboBox
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
       end
       inherited cxGroupBox2: TcxGroupBox
@@ -95,39 +95,39 @@ object frmParamSet: TfrmParamSet
           Touch.TabletOptions = []
           ExplicitLeft = 53
           ExplicitTop = 27
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited MaxLen: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited MinWeight: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited MaxWeight: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited BeginPieceNo: TcxTextEdit
           Top = 64
           Properties.OnChange = FrameParam1BeginPieceNoPropertiesChange
           ExplicitTop = 64
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited EndPieceNo: TcxTextEdit
           Properties.OnChange = FrameParam1EndPieceNoPropertiesChange
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
       end
       inherited cxGroupBox3: TcxGroupBox
         ExplicitWidth = 771
         Width = 771
         inherited MPlace: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited YPlace: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited KgPlace: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
       end
       inherited cxGroupBox4: TcxGroupBox
@@ -138,19 +138,19 @@ object frmParamSet: TfrmParamSet
         inherited edtdabao: TcxTextEdit
           Style.Font.Height = -16
           Style.IsFontAssigned = True
-          ExplicitHeight = 34
+          ExplicitHeight = 30
         end
         inherited packRolls: TcxTextEdit
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited rollnoMake: TcxComboBox
           Properties.DropDownListStyle = lsEditFixedList
           Style.Font.Charset = GB2312_CHARSET
           Style.IsFontAssigned = True
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited packNoMake: TcxComboBox
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
         inherited packPrintPreview: TCheckBox
           Top = 74
@@ -161,15 +161,14 @@ object frmParamSet: TfrmParamSet
         inherited packlabNumber: TcxComboBox
           Style.Font.Charset = GB2312_CHARSET
           Style.IsFontAssigned = True
-          ExplicitHeight = 25
         end
         inherited packPrintAction: TcxComboBox
-          ExplicitHeight = 31
+          ExplicitHeight = 27
         end
       end
     end
     inherited weightRule: TcxComboBox
-      ExplicitHeight = 34
+      ExplicitHeight = 30
     end
   end
   object dxPanel1: TdxPanel
diff --git a/T03贸易布匹检验/U_ParamSet.pas b/T03贸易布匹检验/U_ParamSet.pas
index b92a744..1638e99 100644
--- a/T03贸易布匹检验/U_ParamSet.pas
+++ b/T03贸易布匹检验/U_ParamSet.pas
@@ -8,7 +8,7 @@ uses
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, U_frameParam, cxGraphics, cxControls,
   cxLookAndFeels, cxLookAndFeelPainters,   cxGeometry,
   dxFramedControl, Vcl.Menus, Vcl.StdCtrls, cxButtons, dxPanel,
-  Vcl.Touch.Keyboard, Vcl.ExtCtrls, Data.DB, Datasnap.DBClient;
+  Vcl.Touch.Keyboard, Vcl.ExtCtrls, Data.DB, Datasnap.DBClient, dxSkinsCore;
 
 type
   TfrmParamSet = class(TForm)
diff --git a/T03贸易布匹检验/U_frameParam.dfm b/T03贸易布匹检验/U_frameParam.dfm
index 8909c54..4fea047 100644
--- a/T03贸易布匹检验/U_frameParam.dfm
+++ b/T03贸易布匹检验/U_frameParam.dfm
@@ -40,7 +40,6 @@ object FrameParam: TFrameParam
     ParentBackground = False
     ParentFont = False
     TabOrder = 0
-    ExplicitWidth = 605
     object cxGroupBox1: TcxGroupBox
       Left = 2
       Top = 2
@@ -54,8 +53,6 @@ object FrameParam: TFrameParam
       Style.Font.Style = [fsBold]
       Style.IsFontAssigned = True
       TabOrder = 0
-      ExplicitTop = -4
-      ExplicitWidth = 601
       Height = 122
       Width = 662
       object Label16: TLabel
@@ -221,7 +218,7 @@ object FrameParam: TFrameParam
         Style.IsFontAssigned = True
         TabOrder = 3
         Text = #8730
-        OnClick = edtMaBiaoClick
+        OnClick = outPageClick
         Width = 34
       end
       object labNumber: TComboBox
@@ -297,7 +294,6 @@ object FrameParam: TFrameParam
       Style.Font.Style = [fsBold]
       Style.IsFontAssigned = True
       TabOrder = 1
-      ExplicitWidth = 601
       Height = 123
       Width = 662
       object Label9: TLabel
@@ -448,7 +444,6 @@ object FrameParam: TFrameParam
       Style.Font.Style = [fsBold]
       Style.IsFontAssigned = True
       TabOrder = 2
-      ExplicitWidth = 601
       Height = 132
       Width = 662
       object Label19: TLabel
@@ -585,7 +580,6 @@ object FrameParam: TFrameParam
       Style.Font.Style = [fsBold]
       Style.IsFontAssigned = True
       TabOrder = 3
-      ExplicitWidth = 601
       Height = 122
       Width = 662
       object Label31: TLabel
diff --git a/T03贸易布匹检验/U_frameParam.pas b/T03贸易布匹检验/U_frameParam.pas
index 9a762a6..f86fc2b 100644
--- a/T03贸易布匹检验/U_frameParam.pas
+++ b/T03贸易布匹检验/U_frameParam.pas
@@ -3,11 +3,11 @@ unit U_frameParam;
 interface
 
 uses
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes,
-  Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics, cxControls,
-  cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit, 
-   cxGroupBox, Vcl.StdCtrls, cxTextEdit, Vcl.ExtCtrls, cxMaskEdit,
-  cxDropDownEdit;
+  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
+  System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit,
+  cxGroupBox, Vcl.StdCtrls, cxTextEdit, Vcl.ExtCtrls, cxMaskEdit, cxDropDownEdit,
+  dxSkinsCore;
 
 type
   TFrameParam = class(TFrame)
@@ -66,6 +66,7 @@ type
     packPrintAction: TcxComboBox;
     presentNumFlag: TcxComboBox;
     procedure edtMaBiaoClick(Sender: TObject);
+    procedure outPageClick(Sender: TObject);
   private
     { Private declarations }
   public
@@ -81,13 +82,28 @@ begin
   if Trim(TcxTextEdit(Sender).Text) = '' then
   begin
     TcxTextEdit(Sender).Text := '¡Ì';
-    packlabNumber.ItemIndex:=1;
+//    packlabNumber.ItemIndex:=1;
   end
   else
   begin
     TcxTextEdit(Sender).Text := '';
-    packlabNumber.ItemIndex:=0;
+//    packlabNumber.ItemIndex:=0;
+  end;
+end;
+
+procedure TFrameParam.outPageClick(Sender: TObject);
+begin
+  if Trim(TcxTextEdit(Sender).Text) = '' then
+  begin
+    TcxTextEdit(Sender).Text := '¡Ì';
+    packlabNumber.ItemIndex := 1;
+  end
+  else
+  begin
+    TcxTextEdit(Sender).Text := '';
+    packlabNumber.ItemIndex := 0;
   end;
 end;
 
 end.
+
diff --git a/T03贸易布匹检验/U_iniParam.pas b/T03贸易布匹检验/U_iniParam.pas
index b3c997d..680d314 100644
--- a/T03贸易布匹检验/U_iniParam.pas
+++ b/T03贸易布匹检验/U_iniParam.pas
@@ -110,6 +110,7 @@ begin
   programIni.WriteString('Éú²ú³µ¼äÅäÖÃ', 'ÆôÓÃÂë±íDllÎļþ', IsMBDYDll);
   programIni.WriteString('Éú²ú³µ¼äÅäÖÃ', 'ÆôÓÃÂë±íµ¥Î»', IsMBDYDllUnit);
 
+
   programIni.WriteString('Éú²ú³µ¼äÅäÖÃ', '±êÇ©·ÝÊý', LabQty);
 
   programIni.WriteString('Éú²ú³µ¼äÅäÖÃ', 'Ã×ÊýÏÂÏÞ', FMinLen);