diff --git a/云翔一码通/U_GetDllForm.pas b/云翔一码通/U_GetDllForm.pas
index 7d6fd80..d426598 100644
--- a/云翔一码通/U_GetDllForm.pas
+++ b/云翔一码通/U_GetDllForm.pas
@@ -102,7 +102,7 @@ begin
   //������ģ�鴰��
   case FormID of
 
-    111:  //�زֵǼ�
+    111:  //���Ǽ�
       begin
         if frmYMTRKList = nil then
         begin
diff --git a/云翔一码通/U_YMTFHSQList.dfm b/云翔一码通/U_YMTFHSQList.dfm
index 7ecf55d..6d808a3 100644
--- a/云翔一码通/U_YMTFHSQList.dfm
+++ b/云翔一码通/U_YMTFHSQList.dfm
@@ -1,6 +1,6 @@
 object frmYMTFHSQList: TfrmYMTFHSQList
-  Left = 1213
-  Top = 589
+  Left = 499
+  Top = 184
   Width = 1308
   Height = 679
   Caption = #21457#36135#30003#35831
diff --git a/云翔一码通/U_YMTFHSQList.pas b/云翔一码通/U_YMTFHSQList.pas
index 10f18d3..57495da 100644
--- a/云翔一码通/U_YMTFHSQList.pas
+++ b/云翔一码通/U_YMTFHSQList.pas
@@ -272,7 +272,7 @@ begin
       end
       else if Trim(Self.Caption) = '�ӹ������Ǽ�' then
       begin
-        sql.Add(' and CRType in (''�ӹ�����'',''�ӹ�����'',''�ӹ�����'')');
+        sql.Add(' and CRType in (''�����ӹ�'',''�ⷢ�ӹ�'')');
       end;
 
       if ComboBox1.Text = '��' then
@@ -478,11 +478,11 @@ begin
    msql := ' select A.*,B.*  from YMT_FHSQ_Main A inner join YMT_FHSQ_Sub B on A.FSId=B.FSId where A.FSId=''' + Trim(Order_Main.fieldbyname('FSId').AsString) + '''';
   if Trim(Self.Caption) = '���۷�������' then
   begin
-    MPrintJson := '{ "LBName": "���۷������뵥","QrCodeField": "fsid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
+    MPrintJson := '{ "LBName": "���۷������뵥","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
   end
   else if Trim(Self.Caption) = '�ӹ������Ǽ�' then
   begin
-     MPrintJson := '{ "LBName": "�ӹ��������뵥","QrCodeField": "fsid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
+     MPrintJson := '{ "LBName": "�ӹ��������뵥","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
   end;
 
   FunPrint(Application, PChar(MPrintJson));
diff --git a/云翔一码通/U_YMTRKInPut.dfm b/云翔一码通/U_YMTRKInPut.dfm
index 888d3b0..2e5919a 100644
--- a/云翔一码通/U_YMTRKInPut.dfm
+++ b/云翔一码通/U_YMTRKInPut.dfm
@@ -1,10 +1,10 @@
 object frmYMTRKInPut: TfrmYMTRKInPut
-  Left = 465
-  Top = 477
+  Left = 404
+  Top = 447
   Width = 1876
   Height = 623
   Align = alClient
-  Caption = #22238#20179#20837#24211
+  Caption = #20837#24211
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
   Font.Color = clWindowText
@@ -85,7 +85,9 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
-          #21152#24037#23436#25104
+          #22383#24067#20837#24211
+          #22806#21152#24037#20837#24211
+          #26412#21378#21152#24037#20837#24211
           #22238#20462#23436#25104
           #26816#39564#36864#22238
           #26399#21021#20837#24211
@@ -250,14 +252,14 @@ object frmYMTRKInPut: TfrmYMTRKInPut
       end
       object Tv1PiQty: TcxGridDBColumn
         Tag = 2
-        Caption = #21305#25968
+        Caption = #20837#24211#21305#25968
         DataBinding.FieldName = 'PiQty'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.DecimalPlaces = 0
         Properties.DisplayFormat = '0;'
         Properties.OnEditValueChanged = Tv1PiQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
-        Width = 67
+        Width = 70
       end
       object v2Column6: TcxGridDBColumn
         Tag = 2
@@ -281,6 +283,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         Width = 60
       end
       object Tv1Column4: TcxGridDBColumn
+        Tag = 2
         Caption = #23454#38469#31859#25968
         DataBinding.FieldName = 'FactMQty'
         HeaderAlignmentHorz = taCenter
@@ -359,6 +362,13 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
+      object Tv1Column5: TcxGridDBColumn
+        Tag = 2
+        Caption = #23454#38469#21305#25968
+        DataBinding.FieldName = 'FactPiQty'
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
     end
     object cxGrid2Level1: TcxGridLevel
       GridView = Tv1
@@ -653,7 +663,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut
           end
           item
             Kind = skSum
-            Column = TvMXColumn1
+            Column = TvMXKGQty
           end>
         DataController.Summary.SummaryGroups = <>
         OptionsBehavior.AlwaysShowEditor = True
@@ -679,7 +689,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut
           Options.Sorting = False
           Width = 60
         end
-        object TvMXColumn1: TcxGridDBColumn
+        object TvMXKGQty: TcxGridDBColumn
           Caption = #37325#37327
           DataBinding.FieldName = 'KGQty'
           PropertiesClassName = 'TcxTextEditProperties'
@@ -752,6 +762,17 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         ImageIndex = 13
         OnClick = TbDeleteRowClick
       end
+      object ReadMQty: TCheckBox
+        Left = 138
+        Top = 2
+        Width = 70
+        Height = 30
+        BiDiMode = bdRightToLeftNoAlign
+        Caption = #35835#21462#27719#24635
+        ParentBiDiMode = False
+        TabOrder = 0
+        OnClick = ReadMQtyClick
+      end
     end
   end
   object DataSource3: TDataSource
diff --git a/云翔一码通/U_YMTRKInPut.pas b/云翔一码通/U_YMTRKInPut.pas
index 473944b..5195d4b 100644
--- a/云翔一码通/U_YMTRKInPut.pas
+++ b/云翔一码通/U_YMTRKInPut.pas
@@ -88,7 +88,7 @@ type
     cxGridLevel2: TcxGridLevel;
     Tv1Column1: TcxGridDBColumn;
     Tv1Column3: TcxGridDBColumn;
-    TvMXColumn1: TcxGridDBColumn;
+    TvMXKGQty: TcxGridDBColumn;
     Tv1PriceType: TcxGridDBColumn;
     Tv1IsTax: TcxGridDBColumn;
     Tv1Money: TcxGridDBColumn;
@@ -105,6 +105,8 @@ type
     Tv1Column4: TcxGridDBColumn;
     Tv1CustomerNo: TcxGridDBColumn;
     Tv1FactoryNo: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    ReadMQty: TCheckBox;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBAddClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -137,6 +139,7 @@ type
     procedure FormCreate(Sender: TObject);
     procedure TvMXEditKeyDown(Sender: TcxCustomGridTableView; AItem: TcxCustomGridTableItem; AEdit: TcxCustomEdit; var Key: Word; Shift: TShiftState);
     procedure Tv1PiQtyPropertiesEditValueChanged(Sender: TObject);
+    procedure ReadMQtyClick(Sender: TObject);
   private
     { Private declarations }
     function SaveCKData(): Boolean;
@@ -682,6 +685,7 @@ begin
     CDS_Sub.DisableControls;
     // ��ʼ��MXIDs��ÿ�������ʼʱ���
     MXIDs := '';
+
     with CDS_Sub do
     begin
       First;
@@ -1379,7 +1383,10 @@ begin
     if FieldByName('PriceType').Value = '��' then
     begin
       FieldByName('Money').Value := FieldByName('Price').Asfloat * FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
-      FieldByName('FactMQty').Value := FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
+      if ReadMQty.Checked = False then
+        FieldByName('FactMQty').Value := FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100
+      else
+        FieldByName('FactMQty').Value := TvMX.DataController.Summary.FooterSummaryValues[1].asInt * FieldByName('Yardwand').Asfloat / 100;
     end
     else
     begin
@@ -1408,7 +1415,8 @@ begin
     if FieldByName('PriceType').Value = '��' then
     begin
       FieldByName('Money').Value := FieldByName('Price').Asfloat * FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
-      FieldByName('FactMQty').Value := FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
+      if ReadMQty.Checked = False then
+        FieldByName('FactMQty').Value := FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
     end
     else
     begin
@@ -1448,7 +1456,10 @@ begin
         Post;
       end;
     end;
+    CDS_Sub.fieldbyname('FactPiQty').Value := CDS_MX.RecordCount;
+    ;
     ADOQueryCmd.Connection.CommitTrans;
+
   except
     ADOQueryCmd.Connection.RollbackTrans;
     Application.MessageBox('����ʧ��!', '��ʾ', 0);
@@ -1487,7 +1498,7 @@ begin
     FieldByName('KGQty').Value := '0';
     Post;
   end;
-
+  CDS_Sub.fieldbyname('FactPiQty').Value := CDS_MX.RecordCount;
 end;
 
 procedure TfrmYMTRKInPut.TbDeleteRowClick(Sender: TObject);
@@ -1537,6 +1548,7 @@ begin
   end;
   try
     CDS_MX.Delete;
+    CDS_Sub.fieldbyname('FactPiQty').Value := CDS_MX.RecordCount;
   finally
     if CDS_MX.BookmarkValid(Bookmark) then
       CDS_MX.GotoBookmark(Bookmark);
@@ -1601,5 +1613,13 @@ begin
   AddNum.Text := Trim(CDS_Sub.fieldbyname('PiQty').AsString);
 end;
 
+procedure TfrmYMTRKInPut.ReadMQtyClick(Sender: TObject);
+begin
+  if ReadMQty.Checked = False then
+    CDS_Sub.FieldByName('FactMQty').Value := CDS_Sub.FieldByName('Qty').Asfloat * CDS_Sub.FieldByName('Yardwand').Asfloat / 100
+  else
+    CDS_Sub.FieldByName('FactMQty').Value := TvMX.DataController.Summary.FooterSummaryValues[1].asInt * CDS_Sub.FieldByName('Yardwand').Asfloat / 100;
+end;
+
 end.
 
diff --git a/云翔一码通/U_YMTRKList.dfm b/云翔一码通/U_YMTRKList.dfm
index 9c8f90a..36bd86d 100644
--- a/云翔一码通/U_YMTRKList.dfm
+++ b/云翔一码通/U_YMTRKList.dfm
@@ -1,9 +1,9 @@
 object frmYMTRKList: TfrmYMTRKList
-  Left = 380
-  Top = 322
+  Left = 695
+  Top = 340
   Width = 1470
   Height = 823
-  Caption = #38754#26009#22238#20179#30331#35760
+  Caption = #20837#24211#30331#35760
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
   Font.Color = clWindowText
@@ -323,7 +323,9 @@ object frmYMTRKList: TfrmYMTRKList
       OnChange = TBFindClick
       Items.Strings = (
         ''
-        #21152#24037#23436#25104
+        #22383#24067#20837#24211
+        #22806#21152#24037#20837#24211
+        #26412#21378#21152#24037#20837#24211
         #22238#20462#23436#25104
         #26816#39564#36864#22238
         #26399#21021#20837#24211
diff --git a/云翔一码通/U_YMTRKList.pas b/云翔一码通/U_YMTRKList.pas
index 29d2157..4e4e730 100644
--- a/云翔一码通/U_YMTRKList.pas
+++ b/云翔一码通/U_YMTRKList.pas
@@ -941,6 +941,16 @@ begin
       sql.Add('where MXID=' + quotedstr(trim(CDS_MX.fieldbyname('MXID').AsString)));
       execsql;
     end;
+        // ���µ�ǰSPID��ʵ��ƥ��
+    with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('update YMT_CK_CR SET FactPiQty = ' + IntToStr(CDS_MX.RecordCount));
+      sql.Add('where SPID=' + quotedstr(Trim(SPID)));
+      execsql;
+    end;
+
     MXIDs := MMXID + ',' + trim(CDS_MX.fieldbyname('MXID').AsString);
 
     // �ύ���� - ���в����ɹ����
diff --git a/云翔一码通/U_YMTStockSel.dfm b/云翔一码通/U_YMTStockSel.dfm
index aa734d2..6bed630 100644
--- a/云翔一码通/U_YMTStockSel.dfm
+++ b/云翔一码通/U_YMTStockSel.dfm
@@ -1,8 +1,8 @@
 object frmStockSel: TfrmStockSel
-  Left = 787
-  Top = 973
-  Width = 1328
-  Height = 687
+  Left = 609
+  Top = 210
+  Width = 1797
+  Height = 1073
   Caption = #24211#23384#36873#25321
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -21,7 +21,7 @@ object frmStockSel: TfrmStockSel
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1320
+    Width = 1789
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 73
@@ -67,26 +67,13 @@ object frmStockSel: TfrmStockSel
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1320
-    Height = 70
+    Width = 1789
+    Height = 80
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
-    object Label1: TLabel
-      Left = 25
-      Top = 14
-      Width = 80
-      Height = 19
-      Caption = #20837#24211#26102#38388
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -19
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-    end
     object Label4: TLabel
       Left = 406
       Top = 15
@@ -166,6 +153,175 @@ object frmStockSel: TfrmStockSel
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label6: TLabel
+      Left = 1029
+      Top = 12
+      Width = 60
+      Height = 19
+      Caption = #20379#24212#21830
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label8: TLabel
+      Left = 1225
+      Top = 12
+      Width = 80
+      Height = 19
+      Caption = #20135#21697#32534#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label10: TLabel
+      Left = 59
+      Top = 52
+      Width = 40
+      Height = 19
+      Caption = #35268#26684
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label11: TLabel
+      Left = 235
+      Top = 52
+      Width = 62
+      Height = 19
+      Caption = #25104'  '#20998
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label13: TLabel
+      Left = 433
+      Top = 52
+      Width = 82
+      Height = 19
+      Caption = #35746' '#21333' '#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label14: TLabel
+      Left = 1441
+      Top = 12
+      Width = 80
+      Height = 19
+      Caption = #23384#25918#24037#21378
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label17: TLabel
+      Left = 1657
+      Top = 12
+      Width = 40
+      Height = 19
+      Caption = #39068#33394
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label18: TLabel
+      Left = 651
+      Top = 52
+      Width = 40
+      Height = 19
+      Caption = #33457#22411
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label1: TLabel
+      Left = 827
+      Top = 52
+      Width = 40
+      Height = 19
+      Caption = #38376#24133
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label9: TLabel
+      Left = 1003
+      Top = 52
+      Width = 40
+      Height = 19
+      Caption = #20811#37325
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label15: TLabel
+      Left = 1195
+      Top = 52
+      Width = 40
+      Height = 19
+      Caption = #24211#20301
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label16: TLabel
+      Left = 1371
+      Top = 52
+      Width = 40
+      Height = 19
+      Caption = #32568#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label19: TLabel
+      Left = 1547
+      Top = 52
+      Width = 40
+      Height = 19
+      Caption = #24037#33402
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BegDate: TDateTimePicker
       Left = 108
       Top = 10
@@ -254,7 +410,7 @@ object frmStockSel: TfrmStockSel
     end
     object CRType: TComboBox
       Tag = 2
-      Left = 884
+      Left = 882
       Top = 10
       Width = 139
       Height = 27
@@ -280,11 +436,235 @@ object frmStockSel: TfrmStockSel
         #37319#36141#20837#24211
         #27425#21697#20837#24211)
     end
+    object spcode: TEdit
+      Tag = 2
+      Left = 1313
+      Top = 8
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 7
+      OnChange = CustomerNoNameChange
+    end
+    object FactoryName: TEdit
+      Tag = 2
+      Left = 1097
+      Top = 8
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 8
+      OnChange = CustomerNoNameChange
+    end
+    object SPSpec: TEdit
+      Tag = 2
+      Left = 107
+      Top = 48
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 9
+      OnChange = CustomerNoNameChange
+    end
+    object SPCF: TEdit
+      Tag = 2
+      Left = 305
+      Top = 48
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 10
+      OnChange = CustomerNoNameChange
+    end
+    object OrderNo: TEdit
+      Tag = 2
+      Left = 523
+      Top = 48
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 11
+      OnChange = CustomerNoNameChange
+    end
+    object ToFactoryName: TEdit
+      Tag = 2
+      Left = 1529
+      Top = 8
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 12
+      OnChange = CustomerNoNameChange
+    end
+    object SPColor: TEdit
+      Tag = 2
+      Left = 1705
+      Top = 8
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 13
+      OnChange = CustomerNoNameChange
+    end
+    object SPHX: TEdit
+      Tag = 2
+      Left = 699
+      Top = 48
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 14
+      OnChange = CustomerNoNameChange
+    end
+    object CheckBox1: TCheckBox
+      Left = 8
+      Top = 16
+      Width = 97
+      Height = 17
+      Caption = #20837#24211#26102#38388
+      Checked = True
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      State = cbChecked
+      TabOrder = 15
+    end
+    object SPKZ: TEdit
+      Tag = 2
+      Left = 1051
+      Top = 48
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 16
+      OnChange = CustomerNoNameChange
+    end
+    object SPMF: TEdit
+      Tag = 2
+      Left = 875
+      Top = 48
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 17
+      OnChange = CustomerNoNameChange
+    end
+    object KuWei: TEdit
+      Tag = 2
+      Left = 1243
+      Top = 45
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 18
+      OnChange = CustomerNoNameChange
+    end
+    object GYLXName: TEdit
+      Tag = 2
+      Left = 1595
+      Top = 45
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 19
+      OnChange = CustomerNoNameChange
+    end
+    object RCGangNo: TEdit
+      Tag = 2
+      Left = 1419
+      Top = 45
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ParentFont = False
+      TabOrder = 20
+      OnChange = CustomerNoNameChange
+    end
   end
   object cxSplitter1: TcxSplitter
     Left = 0
-    Top = 648
-    Width = 1320
+    Top = 1034
+    Width = 1789
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
     AlignSplitter = salBottom
@@ -292,12 +672,12 @@ object frmStockSel: TfrmStockSel
   end
   object cxGrid2: TcxGrid
     Left = 0
-    Top = 102
-    Width = 1320
-    Height = 546
+    Top = 417
+    Width = 1789
+    Height = 617
     Align = alClient
     TabOrder = 3
-    object Tv1: TcxGridDBTableView
+    object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -329,7 +709,7 @@ object frmStockSel: TfrmStockSel
         end
         item
           Kind = skSum
-          Column = Tv1Column4
+          Column = TV2Column4
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -340,7 +720,7 @@ object frmStockSel: TfrmStockSel
       Styles.IncSearch = DataLink_YXYMT.SHuangSe
       Styles.Selection = DataLink_YXYMT.SHuangSe
       Styles.Header = DataLink_YXYMT.Default
-      object Tv1SSel: TcxGridDBColumn
+      object TV2SSel: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
         PropertiesClassName = 'TcxCheckBoxProperties'
@@ -394,7 +774,7 @@ object frmStockSel: TfrmStockSel
         Options.Editing = False
         Width = 102
       end
-      object Tv1Column3: TcxGridDBColumn
+      object TV2Column3: TcxGridDBColumn
         Caption = #23458#25143
         DataBinding.FieldName = 'CustomerNoName'
         HeaderAlignmentHorz = taCenter
@@ -503,7 +883,7 @@ object frmStockSel: TfrmStockSel
         Options.Editing = False
         Width = 75
       end
-      object Tv1Column2: TcxGridDBColumn
+      object TV2Column2: TcxGridDBColumn
         Caption = #24037#33402
         DataBinding.FieldName = 'GYLXName'
         HeaderAlignmentHorz = taCenter
@@ -519,7 +899,7 @@ object frmStockSel: TfrmStockSel
         Options.Editing = False
         Width = 62
       end
-      object Tv1Column4: TcxGridDBColumn
+      object TV2Column4: TcxGridDBColumn
         Caption = #37325#37327
         DataBinding.FieldName = 'KgQty'
         HeaderAlignmentHorz = taCenter
@@ -539,7 +919,7 @@ object frmStockSel: TfrmStockSel
         Options.Editing = False
         Width = 66
       end
-      object Tv1Column1: TcxGridDBColumn
+      object TV2Column1: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
         HeaderAlignmentHorz = taCenter
@@ -573,7 +953,294 @@ object frmStockSel: TfrmStockSel
       end
     end
     object cxGrid2Level1: TcxGridLevel
-      GridView = Tv1
+      GridView = TV2
+    end
+  end
+  object cxGrid1: TcxGrid
+    Left = 0
+    Top = 112
+    Width = 1789
+    Height = 305
+    Align = alTop
+    TabOrder = 4
+    Visible = False
+    object TV1: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      DataController.DataSource = DataSource1
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skCount
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = cxGridDBColumn20
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Format = '#,###'
+          Kind = skSum
+        end
+        item
+          Format = '#,###'
+          Kind = skSum
+        end
+        item
+          Format = '#,###'
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = cxGridDBColumn21
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsCustomize.ColumnFiltering = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      OptionsView.Indicator = True
+      Styles.Inactive = DataLink_YXYMT.SHuangSe
+      Styles.IncSearch = DataLink_YXYMT.SHuangSe
+      Styles.Selection = DataLink_YXYMT.SHuangSe
+      Styles.Header = DataLink_YXYMT.Default
+      object cxGridDBColumn1: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'SSel'
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        HeaderAlignmentHorz = taCenter
+        Width = 47
+      end
+      object cxGridDBColumn2: TcxGridDBColumn
+        Caption = #20837#24211#21333#21495
+        DataBinding.FieldName = 'SPID'
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 83
+      end
+      object cxGridDBColumn3: TcxGridDBColumn
+        Tag = 2
+        Caption = #20837#24211#26102#38388
+        DataBinding.FieldName = 'CRTime'
+        PropertiesClassName = 'TcxDateEditProperties'
+        Properties.SaveTime = False
+        Properties.ShowTime = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 100
+      end
+      object cxGridDBColumn4: TcxGridDBColumn
+        Tag = 2
+        Caption = #20837#24211#31867#22411
+        DataBinding.FieldName = 'CRType'
+        PropertiesClassName = 'TcxComboBoxProperties'
+        Properties.DropDownListStyle = lsFixedList
+        Properties.Items.Strings = (
+          #21152#24037#23436#25104
+          #29983#20135#36864#22238)
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 83
+      end
+      object cxGridDBColumn5: TcxGridDBColumn
+        Caption = #35746#21333#21495
+        DataBinding.FieldName = 'OrderNo'
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 102
+      end
+      object cxGridDBColumn6: TcxGridDBColumn
+        Caption = #23458#25143
+        DataBinding.FieldName = 'CustomerNoName'
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object cxGridDBColumn7: TcxGridDBColumn
+        Tag = 2
+        Caption = #20379#24212#21830
+        DataBinding.FieldName = 'FactoryName'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.ReadOnly = True
+        HeaderAlignmentHorz = taCenter
+        Width = 101
+      end
+      object cxGridDBColumn8: TcxGridDBColumn
+        Tag = 2
+        Caption = #21697#21517
+        DataBinding.FieldName = 'SPName'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.ReadOnly = True
+        HeaderAlignmentHorz = taCenter
+        Width = 97
+      end
+      object cxGridDBColumn9: TcxGridDBColumn
+        Tag = 2
+        Caption = #20135#21697#32534#21495
+        DataBinding.FieldName = 'spcode'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 70
+      end
+      object cxGridDBColumn10: TcxGridDBColumn
+        Tag = 2
+        Caption = #35268#26684
+        DataBinding.FieldName = 'SPSpec'
+        HeaderAlignmentHorz = taCenter
+        HeaderGlyphAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 65
+      end
+      object cxGridDBColumn11: TcxGridDBColumn
+        Tag = 2
+        Caption = #25104#20998
+        DataBinding.FieldName = 'SPCF'
+        HeaderAlignmentHorz = taCenter
+        HeaderGlyphAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 73
+      end
+      object cxGridDBColumn12: TcxGridDBColumn
+        Tag = 2
+        Caption = #38376#24133
+        DataBinding.FieldName = 'SPMF'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 73
+      end
+      object cxGridDBColumn13: TcxGridDBColumn
+        Tag = 2
+        Caption = #20811#37325
+        DataBinding.FieldName = 'SPKZ'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 90
+      end
+      object cxGridDBColumn14: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'SPColor'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 69
+      end
+      object cxGridDBColumn15: TcxGridDBColumn
+        Caption = #33457#22411#33457#21495
+        DataBinding.FieldName = 'SPHX'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 70
+      end
+      object cxGridDBColumn16: TcxGridDBColumn
+        Tag = 2
+        Caption = #23384#25918#24037#21378
+        DataBinding.FieldName = 'ToFactoryName'
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 84
+      end
+      object cxGridDBColumn17: TcxGridDBColumn
+        Caption = #24211#20301
+        DataBinding.FieldName = 'KuWei'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 86
+      end
+      object cxGridDBColumn18: TcxGridDBColumn
+        Caption = #32568#21495
+        DataBinding.FieldName = 'RCGangNo'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 75
+      end
+      object cxGridDBColumn19: TcxGridDBColumn
+        Caption = #24037#33402
+        DataBinding.FieldName = 'GYLXName'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 55
+      end
+      object cxGridDBColumn20: TcxGridDBColumn
+        Tag = 2
+        Caption = #25968#37327
+        DataBinding.FieldName = 'MQty'
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 62
+      end
+      object cxGridDBColumn21: TcxGridDBColumn
+        Caption = #37325#37327
+        DataBinding.FieldName = 'KgQty'
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object cxGridDBColumn22: TcxGridDBColumn
+        Tag = 2
+        Caption = #25968#37327#21333#20301
+        DataBinding.FieldName = 'QtyUnit'
+        PropertiesClassName = 'TcxComboBoxProperties'
+        Properties.DropDownListStyle = lsFixedList
+        Properties.Items.Strings = (
+          'Kg'
+          'M'
+          'Y')
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object cxGridDBColumn23: TcxGridDBColumn
+        Caption = #21333#20215
+        DataBinding.FieldName = 'Price'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 55
+      end
+      object cxGridDBColumn24: TcxGridDBColumn
+        Tag = 2
+        Caption = #26469#33258#24037#21378
+        DataBinding.FieldName = 'FromFactoryName'
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        VisibleForCustomization = False
+        Width = 79
+      end
+      object cxGridDBColumn25: TcxGridDBColumn
+        Tag = 2
+        Caption = #22791#27880
+        DataBinding.FieldName = 'Note'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 79
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = TV1
     end
   end
   object cxGridPopupMenu1: TcxGridPopupMenu
diff --git a/云翔一码通/U_YMTStockSel.pas b/云翔一码通/U_YMTStockSel.pas
index 8cc536d..b84b526 100644
--- a/云翔一码通/U_YMTStockSel.pas
+++ b/云翔一码通/U_YMTStockSel.pas
@@ -36,7 +36,6 @@ type
     Panel1: TPanel;
     BegDate: TDateTimePicker;
     EndDate: TDateTimePicker;
-    Label1: TLabel;
     cxGridPopupMenu1: TcxGridPopupMenu;
     ADOQueryCmd: TADOQuery;
     ADOQueryMain: TADOQuery;
@@ -58,13 +57,13 @@ type
     N3: TMenuItem;
     ToolButton1: TToolButton;
     cxGrid2: TcxGrid;
-    Tv1: TcxGridDBTableView;
-    Tv1SSel: TcxGridDBColumn;
+    TV2: TcxGridDBTableView;
+    TV2SSel: TcxGridDBColumn;
     v1Column6: TcxGridDBColumn;
     v1Column2: TcxGridDBColumn;
     v1Column4: TcxGridDBColumn;
     v1Column13: TcxGridDBColumn;
-    Tv1Column3: TcxGridDBColumn;
+    TV2Column3: TcxGridDBColumn;
     v1Column14: TcxGridDBColumn;
     v2Column1: TcxGridDBColumn;
     v1Column21: TcxGridDBColumn;
@@ -77,22 +76,76 @@ type
     v1Column11: TcxGridDBColumn;
     v1Column18: TcxGridDBColumn;
     v1Column19: TcxGridDBColumn;
-    Tv1Column2: TcxGridDBColumn;
+    TV2Column2: TcxGridDBColumn;
     v2Column6: TcxGridDBColumn;
-    Tv1Column4: TcxGridDBColumn;
+    TV2Column4: TcxGridDBColumn;
     v1Column3: TcxGridDBColumn;
-    Tv1Column1: TcxGridDBColumn;
+    TV2Column1: TcxGridDBColumn;
     v1Column16: TcxGridDBColumn;
     v1Column12: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
     Label2: TLabel;
     CRType: TComboBox;
     Label3: TLabel;
+    Label6: TLabel;
+    Label8: TLabel;
+    Label10: TLabel;
+    Label11: TLabel;
+    Label13: TLabel;
+    Label14: TLabel;
+    Label17: TLabel;
+    Label18: TLabel;
+    spcode: TEdit;
+    FactoryName: TEdit;
+    SPSpec: TEdit;
+    SPCF: TEdit;
+    OrderNo: TEdit;
+    ToFactoryName: TEdit;
+    SPColor: TEdit;
+    SPHX: TEdit;
+    CheckBox1: TCheckBox;
+    Label1: TLabel;
+    Label9: TLabel;
+    SPKZ: TEdit;
+    SPMF: TEdit;
+    Label15: TLabel;
+    KuWei: TEdit;
+    Label16: TLabel;
+    Label19: TLabel;
+    GYLXName: TEdit;
+    RCGangNo: TEdit;
+    cxGrid1: TcxGrid;
+    TV1: TcxGridDBTableView;
+    cxGridDBColumn1: TcxGridDBColumn;
+    cxGridDBColumn2: TcxGridDBColumn;
+    cxGridDBColumn3: TcxGridDBColumn;
+    cxGridDBColumn4: TcxGridDBColumn;
+    cxGridDBColumn5: TcxGridDBColumn;
+    cxGridDBColumn6: TcxGridDBColumn;
+    cxGridDBColumn7: TcxGridDBColumn;
+    cxGridDBColumn8: TcxGridDBColumn;
+    cxGridDBColumn9: TcxGridDBColumn;
+    cxGridDBColumn10: TcxGridDBColumn;
+    cxGridDBColumn11: TcxGridDBColumn;
+    cxGridDBColumn12: TcxGridDBColumn;
+    cxGridDBColumn13: TcxGridDBColumn;
+    cxGridDBColumn14: TcxGridDBColumn;
+    cxGridDBColumn15: TcxGridDBColumn;
+    cxGridDBColumn16: TcxGridDBColumn;
+    cxGridDBColumn17: TcxGridDBColumn;
+    cxGridDBColumn18: TcxGridDBColumn;
+    cxGridDBColumn19: TcxGridDBColumn;
+    cxGridDBColumn20: TcxGridDBColumn;
+    cxGridDBColumn21: TcxGridDBColumn;
+    cxGridDBColumn22: TcxGridDBColumn;
+    cxGridDBColumn23: TcxGridDBColumn;
+    cxGridDBColumn24: TcxGridDBColumn;
+    cxGridDBColumn25: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
-    procedure TBExportClick(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure CheckBox1Click(Sender: TObject);
@@ -147,7 +200,8 @@ end;
 procedure TfrmStockSel.TBCloseClick(Sender: TObject);
 begin
   Close;
-  WriteCxGrid('����ָʾ����YX', Tv1, '����ָʾ������');
+  WriteCxGrid('���ѡ������', Tv1, '���ѡ��');
+  WriteCxGrid('���ѡ����ϸ', Tv2, '���ѡ��');
 end;
 
 procedure TfrmStockSel.InitGrid();
@@ -164,8 +218,13 @@ begin
       sql.Clear;
       sql.Add(' select A.* ');
       sql.Add(' from YMT_CK_CR A');
-      sql.add(' where A.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''');
-      sql.Add(' and A.CRTime<=''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
+      sql.add(' where 1=1');
+      if CheckBox1.Checked = True then
+      begin
+        sql.add(' and A.CRTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''');
+        sql.Add(' and A.CRTime<=''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
+      end;
+
       sql.Add(' and isnull(CKName,'''')=''����''');
       SQL.Add(' and CRFlag=''���''  ');
       SQL.Add(' and valid=''Y''  ');
@@ -181,20 +240,14 @@ end;
 
 procedure TfrmStockSel.InitForm();
 begin
-  ReadCxGrid('����ָʾ����YX', Tv1, '����ָʾ������');
+  ReadCxGrid('���ѡ������', Tv1, '���ѡ��');
+  ReadCxGrid('���ѡ����ϸ', Tv2, '���ѡ��');
   EndDate.DateTime := SGetServerDate10(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime;
+  BegDate.DateTime := IncMonth(EndDate.DateTime, -6);
   InitGrid();
 
 end;
 
-procedure TfrmStockSel.TBExportClick(Sender: TObject);
-begin
-  if ADOQueryMain.IsEmpty then
-    Exit;
-  SelExportData(Tv1, ADOQueryMain, '����Ⱦɫ�ƻ���');
-end;
-
 procedure TfrmStockSel.TBRafreshClick(Sender: TObject);
 begin
   InitGrid();
diff --git a/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.dfm b/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.dfm
index c1b0589..09b26fd 100644
--- a/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.dfm
+++ b/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.dfm
@@ -19,7 +19,7 @@ object frmKuWeiInPutCeng: TfrmKuWeiInPutCeng
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 913
+    Width = 921
     Height = 30
     ButtonHeight = 30
     ButtonWidth = 79
@@ -93,7 +93,7 @@ object frmKuWeiInPutCeng: TfrmKuWeiInPutCeng
     Left = 0
     Top = 30
     Width = 313
-    Height = 503
+    Height = 510
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -222,7 +222,6 @@ object frmKuWeiInPutCeng: TfrmKuWeiInPutCeng
         Top = 136
         Width = 307
         Height = 118
-        ActivePage = cxTabSheet1
         Align = alBottom
         Font.Charset = GB2312_CHARSET
         Font.Color = clWindowText
@@ -230,8 +229,10 @@ object frmKuWeiInPutCeng: TfrmKuWeiInPutCeng
         Font.Name = #23435#20307
         Font.Style = [fsBold]
         ParentFont = False
-        Style = 8
         TabOrder = 2
+        Properties.ActivePage = cxTabSheet1
+        Properties.CustomButtons.Buttons = <>
+        Properties.Style = 8
         ClientRectBottom = 118
         ClientRectRight = 307
         ClientRectTop = 26
@@ -434,13 +435,13 @@ object frmKuWeiInPutCeng: TfrmKuWeiInPutCeng
   object cxGrid1: TcxGrid
     Left = 313
     Top = 30
-    Width = 600
-    Height = 503
+    Width = 608
+    Height = 510
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
     object Tv1: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <
diff --git a/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.pas b/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.pas
index 33416e9..611ec9a 100644
--- a/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.pas
+++ b/云翔生产管理(MYSC.dll)/U_KuWeiInPutCeng.pas
@@ -12,7 +12,22 @@ uses
   ExtCtrls, BtnEdit, cxCalendar,StrUtils, cxDropDownEdit,jpeg,
   IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, cxPC,
   cxGridCustomPopupMenu, cxGridPopupMenu, cxGroupBox, cxCheckBox,
-  RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport,IniFiles, Menus;
+  RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport,IniFiles, Menus,
+  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle,
+  dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary,
+  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter,
+  dxBarBuiltInMenu, cxNavigator;
 
 type
   TfrmKuWeiInPutCeng = class(TForm)
@@ -505,9 +520,9 @@ begin
       Application.MessageBox('�ڼ��ŷǷ�����!','��ʾ',0);
       Exit;
     end;
-    if StrToInt(pai.Text)>99 then
+    if StrToInt(pai.Text)>299 then
     begin
-      Application.MessageBox('�ڼ��Ų��ܴ���100��','��ʾ',0);
+      Application.MessageBox('�ڼ��Ų��ܴ���300��','��ʾ',0);
       Exit;
     end;
   end else
@@ -523,9 +538,9 @@ begin
       Application.MessageBox('���������Ƿ�����!','��ʾ',0);
       Exit;
     end;
-    if StrToInt(paiQty.Text)>99 then
+    if StrToInt(paiQty.Text)>299 then
     begin
-      Application.MessageBox('�����������ܴ���100��','��ʾ',0);
+      Application.MessageBox('�����������ܴ���300��','��ʾ',0);
       Exit;
     end;
   end;