11

A00通用窗体/U_LabelMapSet.dfm

@@ -194,6 +194,7 @@ object frmLabelMapSet: TfrmLabelMapSet
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
+    ExplicitTop = 32
     object Label1: TLabel
       Left = 51
       Top = 20

A00通用窗体/U_ProductInfoSel.dfm

@@ -77,14 +77,14 @@ inherited frmProductInfoSel: TfrmProductInfoSel
       Height = 12
       Caption = #21517#31216
     end
-    object CoName: TEdit
+    object P_Name: TEdit
       Tag = 2
       Left = 53
       Top = 12
       Width = 169
       Height = 20
       TabOrder = 0
-      OnChange = CoNameChange
+      OnChange = P_NameChange
     end
   end
   object cxGrid2: TcxGrid [2]
@@ -94,7 +94,6 @@ inherited frmProductInfoSel: TfrmProductInfoSel
     Height = 476
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 76
     object Tv1: TcxGridDBTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>

A00通用窗体/U_ProductInfoSel.pas

@@ -27,7 +27,7 @@ type
     ADOConnection1: TADOConnection;
     Panel1: TPanel;
     Label1: TLabel;
-    CoName: TEdit;
+    P_Name: TEdit;
     GPM_1: TcxGridPopupMenu;
     ImageList1: TImageList;
     ThreeColorBase: TcxStyleRepository;
@@ -63,7 +63,7 @@ type
     procedure TBSaveClick(Sender: TObject);
     procedure TV1DblClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
-    procedure CoNameChange(Sender: TObject);
+    procedure P_NameChange(Sender: TObject);
   private
     procedure InitGrid();
     { Private declarations }
@@ -99,7 +99,7 @@ begin
   end;
 end;
 
-procedure TfrmProductInfoSel.CoNameChange(Sender: TObject);
+procedure TfrmProductInfoSel.P_NameChange(Sender: TObject);
 begin
   if ADOQueryMain.Active then
   begin
@@ -113,7 +113,7 @@ end;
 procedure TfrmProductInfoSel.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
 
-  CoName.SetFocus;
+  P_Name.SetFocus;
 
   Action := cahide;
 end;
@@ -159,7 +159,7 @@ end;
 
 procedure TfrmProductInfoSel.ToolButton1Click(Sender: TObject);
 begin
-  CoName.SetFocus;
+  P_Name.SetFocus;
   ModalResult := 1;
 end;
 

A01基础公司管理/Company.dproj.local

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

A02基础产品管理/ClothInfo.dproj.local

@@ -18,15 +18,15 @@
     <Transaction>1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm</Transaction>

A02基础产品管理/U_ClothInfo.dfm

@@ -7,6 +7,7 @@ inherited frmClothInfo: TfrmClothInfo
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  ExplicitLeft = -593
   ExplicitWidth = 1460
   ExplicitHeight = 741
   PixelsPerInch = 96
@@ -330,14 +331,24 @@ inherited frmClothInfo: TfrmClothInfo
     BevelOuter = bvLowered
     Caption = 'Panel3'
     TabOrder = 4
+    object Splitter1: TSplitter
+      Left = 825
+      Top = 60
+      Height = 352
+      ExplicitLeft = 936
+      ExplicitTop = 240
+      ExplicitHeight = 100
+    end
     object cxGrid1: TcxGrid
       Left = 2
       Top = 60
-      Width = 1212
+      Width = 823
       Height = 352
-      Align = alClient
+      Align = alLeft
       PopupMenu = PM_1
       TabOrder = 0
+      ExplicitLeft = 6
+      ExplicitTop = 59
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
@@ -353,6 +364,7 @@ inherited frmClothInfo: TfrmClothInfo
         OptionsCustomize.ColumnFiltering = False
         OptionsData.Deleting = False
         OptionsData.DeletingConfirmation = False
+        OptionsView.ColumnAutoWidth = True
         OptionsView.GroupByBox = False
         Styles.IncSearch = DataLink_ClothInfo.SHuangSe
         Styles.Header = DataLink_ClothInfo.Default
@@ -653,6 +665,34 @@ inherited frmClothInfo: TfrmClothInfo
       ClientRectRight = 0
       ClientRectTop = 0
     end
+    object cxGrid2: TcxGrid
+      Left = 828
+      Top = 60
+      Width = 386
+      Height = 352
+      Align = alClient
+      TabOrder = 4
+      ExplicitLeft = 831
+      ExplicitTop = 56
+      object Tv2: TcxGridDBTableView
+        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
+        DataController.DataSource = DS_2
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <>
+        DataController.Summary.SummaryGroups = <>
+        OptionsView.CellAutoHeight = True
+        OptionsView.GroupByBox = False
+        object Tv2DTMName: TcxGridDBColumn
+          Caption = #24037#33402#21517#31216
+          DataBinding.FieldName = 'DTMName'
+          DataBinding.IsNullValueType = True
+        end
+      end
+      object cxGrid2Level1: TcxGridLevel
+        GridView = Tv2
+      end
+    end
   end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_ClothInfo.ADOLink
@@ -836,4 +876,15 @@ inherited frmClothInfo: TfrmClothInfo
     Left = 520
     Top = 426
   end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 1228
+    Top = 227
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 1332
+    Top = 235
+  end
 end

A02基础产品管理/U_ClothInfo.pas

@@ -130,6 +130,13 @@ type
     cxTabControl1: TcxTabControl;
     Tv1CINote: TcxGridDBColumn;
     Tv1Material: TcxGridDBColumn;
+    Tv2: TcxGridDBTableView;
+    cxGrid2Level1: TcxGridLevel;
+    cxGrid2: TcxGrid;
+    Splitter1: TSplitter;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    Tv2DTMName: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure TBDelClick(Sender: TObject);

A02基础产品管理/U_ClothInfoInput.dfm

@@ -3,7 +3,7 @@ object frmClothInfoInput: TfrmClothInfoInput
   Top = 231
   Caption = #20135#21697#20449#24687#24405#20837
   ClientHeight = 748
-  ClientWidth = 1080
+  ClientWidth = 1200
   Color = clWhite
   Font.Charset = GB2312_CHARSET
   Font.Color = clWindowText
@@ -18,11 +18,11 @@ object frmClothInfoInput: TfrmClothInfoInput
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1080
+    Width = 1200
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 75
+    ButtonWidth = 91
     Caption = 'ToolBar1'
     Color = clWhite
     DisabledImages = DataLink_ClothInfo.ImageList_new32
@@ -48,10 +48,18 @@ object frmClothInfoInput: TfrmClothInfoInput
       ImageIndex = 22
       OnClick = TbUpFileClick
     end
-    object TBClose: TToolButton
+    object ToolButton5: TToolButton
       Left = 142
       Top = 0
       AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = ToolButton5Click
+    end
+    object TBClose: TToolButton
+      Left = 237
+      Top = 0
+      AutoSize = True
       Caption = #20851#38381
       ImageIndex = 7
       OnClick = TBCloseClick
@@ -60,7 +68,7 @@ object frmClothInfoInput: TfrmClothInfoInput
   object cxPageControl1: TcxPageControl
     Left = 0
     Top = 38
-    Width = 1080
+    Width = 1200
     Height = 710
     Align = alTop
     Font.Charset = GB2312_CHARSET
@@ -75,7 +83,7 @@ object frmClothInfoInput: TfrmClothInfoInput
     Properties.CustomButtons.Buttons = <>
     ClientRectBottom = 708
     ClientRectLeft = 2
-    ClientRectRight = 1078
+    ClientRectRight = 1198
     ClientRectTop = 25
     object cxTabSheet1: TcxTabSheet
       Caption = #22522#26412#20449#24687
@@ -89,7 +97,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel1: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 683
         Align = alClient
         Font.Charset = GB2312_CHARSET
@@ -99,6 +107,7 @@ object frmClothInfoInput: TfrmClothInfoInput
         Font.Style = []
         ParentFont = False
         TabOrder = 0
+        ExplicitLeft = 1
         object C_GramWeight: TcxTextEdit
           Tag = 2
           Left = 553
@@ -433,24 +442,23 @@ object frmClothInfoInput: TfrmClothInfoInput
         end
         object cxGrid4: TcxGrid
           Left = 1
-          Top = 336
+          Top = 410
-          Width = 1074
+          Width = 1194
-          Height = 346
+          Height = 272
           Align = alBottom
           TabOrder = 24
-          ExplicitLeft = 2
-          ExplicitTop = 337
           object TV4: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
             ScrollbarAnnotations.CustomAnnotations = <>
+            OnCellDblClick = TV4CellDblClick
             DataController.DataSource = DS_GY
             DataController.Summary.DefaultGroupSummaryItems = <>
             DataController.Summary.FooterSummaryItems = <>
             DataController.Summary.SummaryGroups = <>
             OptionsView.GroupByBox = False
             object TV4F_Code: TcxGridDBColumn
-              Caption = #22383#24067#32534#21495
+              Caption = #22383#24067#21517#31216
-              DataBinding.FieldName = 'F_Code'
+              DataBinding.FieldName = 'F_Name'
               DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Width = 90
@@ -474,7 +482,7 @@ object frmClothInfoInput: TfrmClothInfoInput
               DataBinding.FieldName = 'DTMPSlist'
               DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
-              Width = 455
+              Width = 469
             end
             object TV4DTMID: TcxGridDBColumn
               Caption = #24037#33402#20027#38190
@@ -489,11 +497,12 @@ object frmClothInfoInput: TfrmClothInfoInput
         end
         object Panel8: TPanel
           Left = 1
-          Top = 295
+          Top = 369
-          Width = 1074
+          Width = 1194
           Height = 41
           Align = alBottom
           TabOrder = 25
+          ExplicitTop = 295
           object Panel9: TPanel
             Left = 1
             Top = 42
@@ -518,7 +527,7 @@ object frmClothInfoInput: TfrmClothInfoInput
           object Panel10: TPanel
             Left = 1
             Top = 1
-            Width = 1072
+            Width = 1192
             Height = 41
             Align = alTop
             TabOrder = 1
@@ -703,6 +712,102 @@ object frmClothInfoInput: TfrmClothInfoInput
           TabOrder = 12
           Width = 240
         end
+        object cxLabel40: TcxLabel
+          Left = 16
+          Top = 257
+          Caption = #22791#27880
+          ParentFont = False
+          Style.Font.Charset = GB2312_CHARSET
+          Style.Font.Color = clWindowText
+          Style.Font.Height = -16
+          Style.Font.Name = #23435#20307
+          Style.Font.Style = [fsBold]
+          Style.IsFontAssigned = True
+        end
+        object CINote: TcxTextEdit
+          Tag = 2
+          Left = 165
+          Top = 248
+          AutoSize = False
+          ParentFont = False
+          Style.Font.Charset = GB2312_CHARSET
+          Style.Font.Color = clWindowText
+          Style.Font.Height = -16
+          Style.Font.Name = #23435#20307
+          Style.Font.Style = []
+          Style.LookAndFeel.SkinName = 'WXI'
+          Style.IsFontAssigned = True
+          StyleDisabled.LookAndFeel.SkinName = 'WXI'
+          StyleFocused.LookAndFeel.SkinName = 'WXI'
+          StyleHot.LookAndFeel.SkinName = 'WXI'
+          TabOrder = 29
+          Height = 40
+          Width = 628
+        end
+        object cxLabel44: TcxLabel
+          Left = 16
+          Top = 307
+          Caption = #20135#21697#40664#35748#24037#33402
+          ParentFont = False
+          Style.Font.Charset = GB2312_CHARSET
+          Style.Font.Color = clWindowText
+          Style.Font.Height = -16
+          Style.Font.Name = #23435#20307
+          Style.Font.Style = [fsBold]
+          Style.IsFontAssigned = True
+        end
+        object DTMPSlist: TcxTextEdit
+          Tag = 2
+          Left = 165
+          Top = 302
+          AutoSize = False
+          ParentFont = False
+          Style.Font.Charset = GB2312_CHARSET
+          Style.Font.Color = clWindowText
+          Style.Font.Height = -16
+          Style.Font.Name = #23435#20307
+          Style.Font.Style = []
+          Style.LookAndFeel.SkinName = 'WXI'
+          Style.IsFontAssigned = True
+          StyleDisabled.LookAndFeel.SkinName = 'WXI'
+          StyleFocused.LookAndFeel.SkinName = 'WXI'
+          StyleHot.LookAndFeel.SkinName = 'WXI'
+          TabOrder = 31
+          Height = 30
+          Width = 628
+        end
+        object cxLabel113: TcxLabel
+          Left = 422
+          Top = 211
+          Caption = #24037#33402#20027#38190
+          ParentFont = False
+          Style.Font.Charset = GB2312_CHARSET
+          Style.Font.Color = clWindowText
+          Style.Font.Height = -16
+          Style.Font.Name = #23435#20307
+          Style.Font.Style = [fsBold]
+          Style.IsFontAssigned = True
+          Visible = False
+        end
+        object DTMID: TcxTextEdit
+          Tag = 2
+          Left = 553
+          Top = 209
+          ParentFont = False
+          Style.Font.Charset = GB2312_CHARSET
+          Style.Font.Color = clWindowText
+          Style.Font.Height = -16
+          Style.Font.Name = #23435#20307
+          Style.Font.Style = []
+          Style.LookAndFeel.SkinName = 'WXI'
+          Style.IsFontAssigned = True
+          StyleDisabled.LookAndFeel.SkinName = 'WXI'
+          StyleFocused.LookAndFeel.SkinName = 'WXI'
+          StyleHot.LookAndFeel.SkinName = 'WXI'
+          TabOrder = 33
+          Visible = False
+          Width = 240
+        end
       end
     end
     object cxTabSheet2: TcxTabSheet
@@ -717,7 +822,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel2: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 683
         Hint = 'tt'
         Align = alClient
@@ -988,7 +1093,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel3: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 683
         Align = alClient
         Font.Charset = GB2312_CHARSET
@@ -1431,7 +1536,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel12: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 683
         Align = alClient
         TabOrder = 0
@@ -1868,7 +1973,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel13: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 683
         Align = alClient
         TabOrder = 0
@@ -2305,7 +2410,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object cxGrid2: TcxGrid
         Left = 0
         Top = 496
-        Width = 1076
+        Width = 1196
         Height = 187
         Align = alBottom
         TabOrder = 0
@@ -2379,7 +2484,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel4: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 458
         Align = alClient
         TabOrder = 1
@@ -2925,7 +3030,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object ToolBar4: TToolBar
         Left = 0
         Top = 458
-        Width = 1076
+        Width = 1196
         Height = 38
         Align = alBottom
         ButtonHeight = 38
@@ -2964,7 +3069,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object cxGrid1: TcxGrid
         Left = 0
         Top = 534
-        Width = 1076
+        Width = 1196
         Height = 149
         Align = alBottom
         TabOrder = 0
@@ -3055,7 +3160,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel5: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 496
         Align = alClient
         TabOrder = 1
@@ -3620,7 +3725,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object ToolBar3: TToolBar
         Left = 0
         Top = 496
-        Width = 1076
+        Width = 1196
         Height = 38
         Align = alBottom
         ButtonHeight = 38
@@ -3653,7 +3758,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object cxGrid3: TcxGrid
         Left = 0
         Top = 456
-        Width = 1076
+        Width = 1196
         Height = 227
         Align = alBottom
         Font.Charset = GB2312_CHARSET
@@ -3748,7 +3853,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel6: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 418
         Align = alClient
         Font.Charset = GB2312_CHARSET
@@ -4250,7 +4355,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object ToolBar5: TToolBar
         Left = 0
         Top = 418
-        Width = 1076
+        Width = 1196
         Height = 38
         Align = alBottom
         ButtonHeight = 38
@@ -4283,7 +4388,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel14: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 418
         Align = alClient
         Font.Charset = GB2312_CHARSET
@@ -4785,7 +4890,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object ToolBar6: TToolBar
         Left = 0
         Top = 418
-        Width = 1076
+        Width = 1196
         Height = 38
         Align = alBottom
         ButtonHeight = 38
@@ -4814,7 +4919,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object cxGrid5: TcxGrid
         Left = 0
         Top = 456
-        Width = 1076
+        Width = 1196
         Height = 227
         Align = alBottom
         Font.Charset = GB2312_CHARSET
@@ -4912,7 +5017,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object Panel15: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 418
         Align = alClient
         Font.Charset = GB2312_CHARSET
@@ -5414,7 +5519,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object ToolBar7: TToolBar
         Left = 0
         Top = 418
-        Width = 1076
+        Width = 1196
         Height = 38
         Align = alBottom
         ButtonHeight = 38
@@ -5443,7 +5548,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object cxGrid6: TcxGrid
         Left = 0
         Top = 456
-        Width = 1076
+        Width = 1196
         Height = 227
         Align = alBottom
         Font.Charset = GB2312_CHARSET
@@ -5547,7 +5652,7 @@ object frmClothInfoInput: TfrmClothInfoInput
       object panel7: TPanel
         Left = 0
         Top = 0
-        Width = 1076
+        Width = 1196
         Height = 683
         Align = alClient
         TabOrder = 0

A02基础产品管理/U_ClothInfoInput.pas

@@ -705,6 +705,13 @@ type
     cxLabel42: TcxLabel;
     C_washWidth: TcxTextEdit;
     TV4F_Code: TcxGridDBColumn;
+    cxLabel40: TcxLabel;
+    CINote: TcxTextEdit;
+    ToolButton5: TToolButton;
+    cxLabel44: TcxLabel;
+    DTMPSlist: TcxTextEdit;
+    cxLabel113: TcxLabel;
+    DTMID: TcxTextEdit;
     procedure FormShow(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure TbSaveClick(Sender: TObject);
@@ -764,6 +771,10 @@ type
 //    procedure TbFBClick(Sender: TObject);
     procedure TbAddClick(Sender: TObject);
     procedure TbDeleteClick(Sender: TObject);
+    procedure ToolButton5Click(Sender: TObject);
+    procedure TV4CellDblClick(Sender: TcxCustomGridTableView;
+      ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
+      AShift: TShiftState; var AHandled: Boolean);
 
   private
     canshu1: string;
@@ -960,6 +971,7 @@ var
 //  Maxid1, maxid2, maxid3, maxgx: string;
 begin
   InitGrid();
+  ReadCxGrid(self.Caption + 'TV4', Tv4, '产品信息录入');
   ArrangeTabsByDataset;
   if CopyInt = 2 then    //¸´ÖÆ
   begin
@@ -1128,6 +1140,7 @@ begin
       end;
       FieldByName('BCIID').Value := Trim(MaxBCIID);
       FieldByName('CTID').Value := Trim(FCTID);
+      FieldByName('F_Name').Value := CDS_GY.FieldByName('F_Name').Value;
       if trim(C_Code.Text) = '×Ô¶¯Éú³É' then
         C_Code.Text := Trim(MaxBCIID);
       RTSetsavedata(ADOQueryCmd, 'BS_Cloth_Info', panel1, 2);
@@ -2691,6 +2704,11 @@ begin
 //  end;
 end;
 
+procedure TfrmClothInfoInput.ToolButton5Click(Sender: TObject);
+begin
+  WriteCxGrid(self.Caption + 'TV4', Tv4, '产品信息录入');
+end;
+
 procedure TfrmClothInfoInput.Tv11fs_NamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
@@ -2800,6 +2818,21 @@ begin
   end;
 end;
 
+procedure TfrmClothInfoInput.TV4CellDblClick(Sender: TcxCustomGridTableView;
+  ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
+  AShift: TShiftState; var AHandled: Boolean);
+begin
+   if CDS_GY.IsEmpty then
+   begin
+     Exit;
+   end
+   else
+   begin
+     DTMPSlist.Text := CDS_GY.FieldByName('DTMPSlist').AsString;
+     DTMID.Text := CDS_GY.FieldByName('DTMID').AsString;
+   end;
+end;
+
 //procedure TfrmClothInfoInput.cxGridDBColumn14PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 //begin
 //  try

B03基础物料仓库/ProductStk.dproj.local

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.923,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.686,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

B03基础物料仓库/U_BSPrtDyeInEdit.dfm

@@ -22,7 +22,6 @@ inherited frmBSPrtDyeInEdit: TfrmBSPrtDyeInEdit
     Height = 425
     Align = alClient
     TabOrder = 0
-    ExplicitTop = 44
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

B03基础物料仓库/U_BSPrtDyeInList.dfm

@@ -233,7 +233,6 @@ inherited frmBSPrtDyeInList: TfrmBSPrtDyeInList
     Height = 541
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 97
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

B03基础物料仓库/U_BSPrtDyeInList.pas

@@ -241,7 +241,12 @@ begin
       SQL.Add(',sum(IOQtyFlag*qty)qty  FROM BS_Product_IO WHERE ');
       sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + '''');
       SQL.Add('AND p_Code=' + QuotedStr(CDS_Main.fieldbyname('p_Code').AsString));
-      SQL.Add('AND BatchNo=' + QuotedStr(CDS_Main.fieldbyname('BatchNo').AsString));
+//      SQL.Add('AND BatchNo=' + QuotedStr(CDS_Main.fieldbyname('BatchNo').AsString));
+      if CDS_Main.fieldbyname('BatchNo').AsString = '' then
+        SQL.Add('AND (BatchNo is NULL OR BatchNo = '''')')
+      else
+        SQL.Add('AND BatchNo=' + QuotedStr(CDS_Main.fieldbyname('BatchNo').AsString));
+
       SQL.Add(' group by  isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''')');
 
 //      showMessage(SQL.Text);

B03基础物料仓库/U_BSPrtDyeOutList.pas

@@ -228,49 +228,49 @@ begin
 
   try
     ADOQueryCmd.Connection.BeginTrans;
-//    with ADOQueryCmd do
-//    begin
-//      Close;
-//      Sql.Clear;
-//      Sql.Add('exec P_BS_Product_Out_Del ');
-//      Sql.Add(' @BPIOIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BPIOID').AsString)));
-//      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
-//      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
-//      Open;
-//    end;
-//    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
-//      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
-
     with ADOQueryCmd do
     begin
       Close;
-      sql.Clear;
+      Sql.Clear;
-      sql.Add(' SELECT  isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''') ');
+      Sql.Add('exec P_BS_Product_Out_Del ');
-      SQL.Add(',sum(IOQtyFlag*qty)qty  FROM BS_Product_IO WHERE ');
+      Sql.Add(' @BPIOIDS=' + quotedstr(Trim(CDS_Main.fieldbyname('BPIOID').AsString)));
-      sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + '''');
+      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
-      SQL.Add('AND p_Code=' + QuotedStr(CDS_Main.fieldbyname('p_Code').AsString));
+      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
-      SQL.Add('AND BatchNo=' + QuotedStr(CDS_Main.fieldbyname('BatchNo').AsString));
+      Open;
-      SQL.Add(' group by  isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''')');
-
-//      showMessage(SQL.Text);
-      OPEN;
     end;
-    if ADOQueryCmd.FieldByName('Qty').Value < CDS_Main.FieldByName('Qty').Value then
+    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
-    begin
+      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
-      raise Exception.Create('入库数量大于库存数量不能删除！');
-    end
-    else
-    begin
-      with ADOQueryCmd do
-      begin
-        Close;
-        sql.Clear;
 
-        SQL.Add('insert into BS_Product_IO_Del select * from BS_Product_IO where BPIOID = ' + QuotedStr(Trim(CDS_Main.FieldByName('BPIOID').value)));
+//    with ADOQueryCmd do
-        SQL.Add('Delete BS_Product_IO where BPIOID = ' + QuotedStr(Trim(CDS_Main.FieldByName('BPIOID').value)));
+//    begin
-        ExecSQL;
+//      Close;
-      end;
+//      sql.Clear;
-    end;
+//      sql.Add(' SELECT  isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''') ');
+//      SQL.Add(',sum(IOQtyFlag*qty)qty  FROM BS_Product_IO WHERE ');
+//      sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + '''');
+//      SQL.Add('AND p_Code=' + QuotedStr(CDS_Main.fieldbyname('p_Code').AsString));
+//      SQL.Add('AND BatchNo=' + QuotedStr(CDS_Main.fieldbyname('BatchNo').AsString));
+//      SQL.Add(' group by  isnull(P_Code,''''),isnull(P_Spec,''''), isnull(BatchNo,''''),isnull(QtyUnit,'''')');
+//
+////      showMessage(SQL.Text);
+//      OPEN;
+//    end;
+//    if ADOQueryCmd.FieldByName('Qty').Value < CDS_Main.FieldByName('Qty').Value then
+//    begin
+//      raise Exception.Create('入库数量大于库存数量不能删除！');
+//    end
+//    else
+//    begin
+//      with ADOQueryCmd do
+//      begin
+//        Close;
+//        sql.Clear;
+//
+//        SQL.Add('insert into BS_Product_IO_Del select * from BS_Product_IO where BPIOID = ' + QuotedStr(Trim(CDS_Main.FieldByName('BPIOID').value)));
+//        SQL.Add('Delete BS_Product_IO where BPIOID = ' + QuotedStr(Trim(CDS_Main.FieldByName('BPIOID').value)));
+//        ExecSQL;
+//      end;
+//    end;
 
     ADOQueryCmd.Connection.CommitTrans;
     CDS_Main.Delete;

F01染色坯布仓库/DyeGreyClothStk.dpr

@@ -28,7 +28,8 @@ uses
   U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint},
   U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule},
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
-  U_DyePlanForCardSel in 'U_DyePlanForCardSel.pas' {frmProductOrderListSel};
+  U_DyePlanForCardSel in 'U_DyePlanForCardSel.pas' {frmProductOrderListSel},
+  U_DyePBImport in 'U_DyePBImport.pas' {frmDyePBImport};
 
 {$R *.res}
 

F01染色坯布仓库/DyeGreyClothStk.dproj

@@ -151,6 +151,10 @@
             <Form>frmProductOrderListSel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_DyePBImport.pas">
+            <Form>frmDyePBImport</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

F01染色坯布仓库/DyeGreyClothStk.dproj.local

@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.865,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.817,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.791,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.278,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.492,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>2025/08/29 17:00:58.000.253,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePlanForCardSel.pas</Transaction>
+    <Transaction>2025/09/29 17:18:11.000.618,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePBImport.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>
@@ -89,5 +90,7 @@
     <File Path="U_iniParam.pas"/>
     <File Path="U_DyePlanForCardSel.pas"/>
     <File Path="U_DyePlanForCardSel.dfm"/>
+    <File Path="U_DyePBImport.pas"/>
+    <File Path="U_DyePBImport.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

F01染色坯布仓库/U_DyeGreyClothInEdit.dfm

@@ -1,7 +1,7 @@
 inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
   Left = 67
   Top = 126
-  Caption = #22383#24067#20837#24211#30331#35760
+  Caption = #22383#24067#20837#24211#24405#20837
   ClientHeight = 546
   ClientWidth = 1340
   Color = clWhite
@@ -22,6 +22,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
     Height = 508
     Align = alClient
     TabOrder = 0
+    ExplicitTop = 44
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -226,6 +227,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
         Caption = #25104#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
@@ -325,24 +327,32 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
       Visible = False
       OnClick = ToolButton5Click
     end
-    object ToolButton2: TToolButton
+    object TbImport: TToolButton
       Left = 760
       Top = 0
       AutoSize = True
+      Caption = #23548#20837
+      ImageIndex = 17
+      OnClick = TbImportClick
+    end
+    object ToolButton2: TToolButton
+      Left = 831
+      Top = 0
+      AutoSize = True
       Caption = #19968#38190#26367#25442
       ImageIndex = 13
       OnClick = ToolButton2Click
     end
     object ToolButton1: TToolButton
-      Left = 855
+      Left = 926
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
-      ImageIndex = 12
+      ImageIndex = 16
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 950
+      Left = 1021
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -390,7 +400,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
   object cxGridPopupMenu2: TcxGridPopupMenu
     Grid = cxGrid2
     PopupMenus = <>
-    Left = 440
+    Left = 464
-    Top = 136
+    Top = 120
   end
 end

F01染色坯布仓库/U_DyeGreyClothInEdit.pas

@@ -56,6 +56,7 @@ type
     Tv1OrderNo: TcxGridDBColumn;
     Tv1Column8: TcxGridDBColumn;
     Tv1C_Code: TcxGridDBColumn;
+    TbImport: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBAddClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -78,6 +79,7 @@ type
     procedure Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure Tv1Column8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure Tv1OrderNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure TbImportClick(Sender: TObject);
   private
     { Private declarations }
     function SaveCKData(): Boolean;
@@ -94,7 +96,7 @@ implementation
 uses
   U_DataLink, U_RTFun, U_ZDYHelp, U_DyePlanCardSel, U_CompanySel,
   U_GreyClothStkSel, U_GreyClothHXSel, U_GreyClothDYSel, U_GreyClothDJHXSel,
-  U_GreyClothHXDJSel, U_ClothInfoSel, U_DyePlanForCardSel;
+  U_GreyClothHXDJSel, U_ClothInfoSel, U_DyePlanForCardSel, U_DyePBImport;
 
 {$R *.dfm}
 
@@ -291,7 +293,7 @@ var
   fsj: string;
 begin
   inherited;
-  ReadCxGrid(FSTKName + '坯布入库登记', Tv1, '机物料仓库');
+  ReadCxGrid(FSTKName + 'Å÷²¼Èë¿â¼Èë', Tv1, 'Å÷²¼Èë¿â¼Èë');
   with ADOQueryTemp do
   begin
     Close;
@@ -344,6 +346,23 @@ begin
 
 end;
 
+procedure TfrmDyeGreyClothInEdit.TbImportClick(Sender: TObject);
+begin
+  try
+    frmDyePBImport := TfrmDyePBImport.Create(Application);
+    with frmDyePBImport do
+    begin
+//      FCTID := Trim(Self.CDS_Tree.fieldbyname('CTID').AsString);
+      if ShowModal = 1 then
+      begin
+//        Self.InitGrid();
+      end;
+    end;
+  finally
+    frmDyePBImport.Free;
+  end;
+end;
+
 procedure TfrmDyeGreyClothInEdit.TBSaveClick(Sender: TObject);
 begin
   if CDS_Sub.IsEmpty then
@@ -394,7 +413,7 @@ end;
 procedure TfrmDyeGreyClothInEdit.ToolButton1Click(Sender: TObject);
 begin
   inherited;
-  WriteCxGrid(FSTKName + '坯布入库登记', Tv1, '机物料仓库');
+  WriteCxGrid(FSTKName + 'Å÷²¼Èë¿â¼Èë', Tv1, 'Å÷²¼Èë¿â¼Èë');
 end;
 
 procedure TfrmDyeGreyClothInEdit.ToolButton2Click(Sender: TObject);
@@ -764,6 +783,9 @@ begin
   end;
 end;
 
+
+
+
 procedure TfrmDyeGreyClothInEdit.Tv1OrderNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   with ADOQueryTemp do
@@ -787,7 +809,10 @@ begin
       Self.CDS_Sub.FieldByName('C_Name').Value := Order_Main.fieldbyname('C_Name').asstring;
       Self.CDS_Sub.FieldByName('C_Code').Value := Order_Main.fieldbyname('C_Code').asstring;
       Self.CDS_Sub.FieldByName('F_Name').Value := Order_Main.fieldbyname('F_Name').asstring;
-//      initGlide();
+
+      Self.CDS_Sub.FieldByName('finishDescription').Value := Order_Main.fieldbyname('finishDescription').asstring;
+//      showMessage(Order_Main.FieldByName('finishDescription').AsString);
+      //      initGlide();
     end;
     free;
   end;
@@ -806,7 +831,7 @@ begin
     FieldByName('F_Width').Value := Trim(ADOQueryTemp.fieldbyname('F_Width').AsString);
     FieldByName('Material').Value := Trim(ADOQueryTemp.fieldbyname('Material').AsString);
 
-    FieldByName('finishDescription').Value := Trim(ADOQueryTemp.fieldbyname('FinishingStandards').AsString);
+//    FieldByName('finishDescription').Value := Trim(ADOQueryTemp.fieldbyname('FinishingStandards').AsString);
     Post;
   end;
 end;

F01染色坯布仓库/U_DyeGreyClothInList.dfm

@@ -1,7 +1,7 @@
 inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
   Left = 165
   Top = 111
-  Caption = #20837#24211#21015#34920
+  Caption = #22383#24067#20837#24211#21015#34920
   ClientHeight = 543
   ClientWidth = 1284
   ExplicitWidth = 1300
@@ -30,6 +30,7 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     ParentFont = False
     ShowCaptions = True
     TabOrder = 0
+    ExplicitTop = 2
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -132,16 +133,9 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     object Label3: TLabel
       Left = 351
       Top = 12
-      Width = 24
-      Height = 12
-      Caption = #21697#21517
-    end
-    object Label4: TLabel
-      Left = 492
-      Top = 12
       Width = 48
       Height = 12
-      Caption = #26469#33258#21333#20301
+      Caption = #25104#21697#21517#31216
     end
     object Label5: TLabel
       Left = 178
@@ -153,9 +147,9 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     object Label8: TLabel
       Left = 351
       Top = 37
-      Width = 24
+      Width = 60
       Height = 12
-      Caption = #35268#26684
+      Caption = #21518#25972#29702#25551#36848
     end
     object Label12: TLabel
       Left = 179
@@ -164,41 +158,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
       Height = 12
       Caption = #20837#24211#31867#22411
     end
-    object Label10: TLabel
-      Left = 492
-      Top = 37
-      Width = 48
-      Height = 12
-      Caption = #25209'    '#21495
-    end
-    object Label6: TLabel
-      Left = 657
-      Top = 12
-      Width = 24
-      Height = 12
-      Caption = #38376#24133
-    end
-    object Label7: TLabel
-      Left = 657
-      Top = 37
-      Width = 24
-      Height = 12
-      Caption = #20811#37325
-    end
-    object Label9: TLabel
-      Left = 807
-      Top = 11
-      Width = 24
-      Height = 12
-      Caption = #22411#21495
-    end
-    object Label11: TLabel
-      Left = 807
-      Top = 36
-      Width = 24
-      Height = 12
-      Caption = #33394#21035
-    end
     object BegDate: TDateTimePicker
       Left = 77
       Top = 8
@@ -219,39 +178,30 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     end
     object C_name: TEdit
       Tag = 2
-      Left = 378
+      Left = 413
       Top = 8
       Width = 100
       Height = 20
       TabOrder = 2
       OnChange = TBFindClick
     end
-    object FromCoName: TEdit
-      Tag = 2
-      Left = 542
-      Top = 8
-      Width = 100
-      Height = 20
-      TabOrder = 3
-      OnChange = FromCoNameChange
-    end
     object BCIOID: TEdit
       Tag = 2
       Left = 228
       Top = 8
       Width = 109
       Height = 20
-      TabOrder = 4
+      TabOrder = 3
       OnChange = BCIOIDChange
     end
-    object C_spec: TEdit
+    object finishDescription: TEdit
       Tag = 2
-      Left = 378
+      Left = 413
       Top = 33
       Width = 100
       Height = 20
-      TabOrder = 5
+      TabOrder = 4
-      OnChange = C_specChange
+      OnChange = finishDescriptionChange
     end
     object IOType: TComboBox
       Tag = 2
@@ -261,7 +211,7 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
       Height = 20
       Style = csDropDownList
       DropDownCount = 20
-      TabOrder = 6
+      TabOrder = 5
       OnChange = TBFindClick
       Items.Strings = (
         #21152#24037#20837#24211
@@ -272,51 +222,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
         #26679#22238#20837#24211
         #26679#36820#20837#24211)
     end
-    object BatchNo: TEdit
-      Tag = 2
-      Left = 542
-      Top = 33
-      Width = 100
-      Height = 20
-      TabOrder = 7
-      OnChange = FromCoNameChange
-    end
-    object C_Width: TEdit
-      Tag = 2
-      Left = 684
-      Top = 8
-      Width = 100
-      Height = 20
-      TabOrder = 8
-      OnChange = TBFindClick
-    end
-    object C_GramWeight: TEdit
-      Tag = 2
-      Left = 684
-      Top = 32
-      Width = 100
-      Height = 20
-      TabOrder = 9
-      OnChange = C_specChange
-    end
-    object C_XINHAO: TEdit
-      Tag = 2
-      Left = 834
-      Top = 7
-      Width = 100
-      Height = 20
-      TabOrder = 10
-      OnChange = TBFindClick
-    end
-    object C_ColorDepth: TEdit
-      Tag = 2
-      Left = 834
-      Top = 31
-      Width = 100
-      Height = 20
-      TabOrder = 11
-      OnChange = C_specChange
-    end
   end
   object cxGrid2: TcxGrid [2]
     Left = 0
@@ -435,15 +340,15 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
         Width = 90
       end
       object Tv1Column4: TcxGridDBColumn
-        Caption = #25104#21697#32534#21495
+        Caption = #25104#21697#21517#31216
-        DataBinding.FieldName = 'C_COde'
+        DataBinding.FieldName = 'C_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 81
       end
       object Tv1F_Code: TcxGridDBColumn
-        Caption = #22383#24067#32534#21495
+        Caption = #22383#24067#21517#31216
-        DataBinding.FieldName = 'F_Code'
+        DataBinding.FieldName = 'F_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 80

F01染色坯布仓库/U_DyeGreyClothInList.pas

@@ -46,14 +46,12 @@ type
     TBAdd: TToolButton;
     TBEdit: TToolButton;
     Label3: TLabel;
-    Label4: TLabel;
     Label5: TLabel;
     Label8: TLabel;
     Label12: TLabel;
     C_name: TEdit;
-    FromCoName: TEdit;
     BCIOID: TEdit;
-    C_spec: TEdit;
+    finishDescription: TEdit;
     IOType: TComboBox;
     cxGrid2: TcxGrid;
     Tv1: TcxGridDBTableView;
@@ -66,22 +64,12 @@ type
     v1Column3: TcxGridDBColumn;
     v1Column12: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
-    Label10: TLabel;
-    BatchNo: TEdit;
     v1Column13: TcxGridDBColumn;
     v1Column15: TcxGridDBColumn;
     ToolButton1: TToolButton;
     ToolButton2: TToolButton;
     Tv1Column2: TcxGridDBColumn;
     Tv1Column4: TcxGridDBColumn;
-    Label6: TLabel;
-    Label7: TLabel;
-    C_Width: TEdit;
-    C_GramWeight: TEdit;
-    Label9: TLabel;
-    Label11: TLabel;
-    C_XINHAO: TEdit;
-    C_ColorDepth: TEdit;
     Tv1lzckordno: TcxGridDBColumn;
     Tv1F_Code: TcxGridDBColumn;
     Tv1OrderNo: TcxGridDBColumn;
@@ -103,12 +91,13 @@ type
     procedure TBAddClick(Sender: TObject);
     procedure TBEditClick(Sender: TObject);
     procedure BCIOIDChange(Sender: TObject);
-    procedure C_specChange(Sender: TObject);
+    procedure finishDescriptionChange(Sender: TObject);
     procedure FromCoNameChange(Sender: TObject);
     procedure cxTabControl1Change(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
     procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+
   private
     canshu1, canshu2, canshu3, FWorkshop: string;
     procedure InitGrid();
@@ -189,7 +178,7 @@ end;
 
 procedure TfrmDyeGreyClothInList.ToolButton1Click(Sender: TObject);
 begin
-  WriteCxGrid(Self.Caption, Tv1, 'ȾɫÅ÷²¼²Ö¿â');
+  WriteCxGrid(Self.Caption, Tv1, 'Å÷²¼Èë¿âÁбí');
 end;
 
 procedure TfrmDyeGreyClothInList.ToolButton2Click(Sender: TObject);
@@ -276,7 +265,7 @@ end;
 procedure TfrmDyeGreyClothInList.FormShow(Sender: TObject);
 begin
   inherited;
-  ReadCxGrid(Self.Caption, Tv1, 'ȾɫÅ÷²¼²Ö¿â');
+  ReadCxGrid(Self.Caption, Tv1, 'Å÷²¼Èë¿âÁбí');
   setStatus();
   InitGrid();
 end;
@@ -298,6 +287,8 @@ begin
   end;
 end;
 
+
+
 procedure TfrmDyeGreyClothInList.N1Click(Sender: TObject);
 begin
   SelOKNo(CDS_Main, True);
@@ -433,7 +424,7 @@ begin
   TBFind.Click;
 end;
 
-procedure TfrmDyeGreyClothInList.C_specChange(Sender: TObject);
+procedure TfrmDyeGreyClothInList.finishDescriptionChange(Sender: TObject);
 begin
   TBFind.Click;
 end;

F01染色坯布仓库/U_DyeGreyClothOutEdit.dfm

@@ -1,7 +1,7 @@
 inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit
   Left = 65
   Top = 113
-  Caption = #20986#24211#30331#35760
+  Caption = #22383#24067#20986#24211#24405#20837
   ClientHeight = 546
   ClientWidth = 1406
   Color = clWhite
@@ -84,10 +84,6 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit
     Height = 508
     Align = alClient
     TabOrder = 1
-    ExplicitLeft = -91
-    ExplicitTop = 96
-    ExplicitWidth = 1284
-    ExplicitHeight = 447
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -192,16 +188,16 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit
       end
       object Tv1Column4: TcxGridDBColumn
         Tag = 2
-        Caption = #25104#21697#32534#21495
+        Caption = #25104#21697#21517#31216
-        DataBinding.FieldName = 'C_COde'
+        DataBinding.FieldName = 'C_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 81
       end
       object Tv1F_Code: TcxGridDBColumn
         Tag = 2
-        Caption = #22383#24067#32534#21495
+        Caption = #22383#24067#21517#31216
-        DataBinding.FieldName = 'F_Code'
+        DataBinding.FieldName = 'F_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 80
@@ -229,7 +225,6 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit
         DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
         Width = 85
       end
       object v1Column15: TcxGridDBColumn
@@ -238,7 +233,6 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit
         DataBinding.FieldName = 'Piece'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
         Width = 65
       end
       object v1Column3: TcxGridDBColumn

F01染色坯布仓库/U_DyeGreyClothOutEdit.pas

@@ -110,7 +110,7 @@ begin
               FieldByName('StkCoName').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('StkCoName').Value;
               FieldByName('ToCoNo').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('StkCoNo').Value;
               FieldByName('ToCoName').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('StkCoName').Value;
-              FieldByName('F_Code').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('F_Code').Value;
+              FieldByName('F_Name').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('F_Name').Value;
               FieldByName('C_Name').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_Name').Value;
 
               FieldByName('C_code').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('C_code').Value;
@@ -257,7 +257,7 @@ var
   fsj: string;
 begin
   inherited;
-  ReadCxGrid(FSTKName + '出库登记', Tv1, '机物料仓库');
+  ReadCxGrid(FSTKName + '坯布出库录入', Tv1, '坯布出库录入');
   with ADOQueryTemp do
   begin
     Close;
@@ -352,7 +352,7 @@ end;
 
 procedure TfrmDyeGreyClothOutEdit.ToolButton1Click(Sender: TObject);
 begin
-  WriteCxGrid(fSTKName + '出库登记', Tv1, '机物料仓库');
+  WriteCxGrid(fSTKName + '坯布出库录入', Tv1, '坯布出库录入');
 
 end;
 

F01染色坯布仓库/U_DyeGreyClothOutList.dfm

@@ -1,7 +1,7 @@
 inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
   Left = 65
   Top = 98
-  Caption = #20986#24211#21015#34920
+  Caption = #22383#24067#20986#24211#21015#34920
   ClientHeight = 546
   ClientWidth = 1193
   Position = poScreenCenter
@@ -132,16 +132,9 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
     object Label3: TLabel
       Left = 321
       Top = 12
-      Width = 24
+      Width = 48
       Height = 12
-      Caption = #21697#21517
+      Caption = #25104#21697#21517#31216
-    end
-    object Label4: TLabel
-      Left = 443
-      Top = 12
-      Width = 36
-      Height = 12
-      Caption = #23458'  '#25143
     end
     object Label5: TLabel
       Left = 178
@@ -153,9 +146,9 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
     object Label8: TLabel
       Left = 321
       Top = 39
-      Width = 24
+      Width = 60
       Height = 12
-      Caption = #35268#26684
+      Caption = #21518#25972#29702#25551#36848
     end
     object Label12: TLabel
       Left = 179
@@ -164,41 +157,6 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
       Height = 12
       Caption = #20986#24211#31867#22411
     end
-    object Label9: TLabel
-      Left = 443
-      Top = 39
-      Width = 36
-      Height = 12
-      Caption = #22411'  '#21495
-    end
-    object Label6: TLabel
-      Left = 587
-      Top = 39
-      Width = 48
-      Height = 12
-      Caption = #35745#21010#21333#21495
-    end
-    object Label7: TLabel
-      Left = 587
-      Top = 12
-      Width = 48
-      Height = 12
-      Caption = #23458#25143#21333#21495
-    end
-    object Label10: TLabel
-      Left = 729
-      Top = 11
-      Width = 24
-      Height = 12
-      Caption = #38376#24133
-    end
-    object Label11: TLabel
-      Left = 729
-      Top = 36
-      Width = 24
-      Height = 12
-      Caption = #20811#37325
-    end
     object Label14: TLabel
       Left = 879
       Top = 35
@@ -226,39 +184,30 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
     end
     object C_NAME: TEdit
       Tag = 2
-      Left = 348
+      Left = 384
       Top = 8
       Width = 80
       Height = 20
       TabOrder = 2
       OnChange = TBFindClick
     end
-    object FTYName: TEdit
-      Tag = 2
-      Left = 483
-      Top = 8
-      Width = 80
-      Height = 20
-      TabOrder = 3
-      OnChange = C_specChange
-    end
     object BCIOID: TEdit
       Tag = 2
       Left = 228
       Top = 8
       Width = 80
       Height = 20
-      TabOrder = 4
+      TabOrder = 3
       OnChange = BCIOIDChange
     end
-    object C_spec: TEdit
+    object finishDescription: TEdit
       Tag = 2
-      Left = 348
+      Left = 384
       Top = 35
       Width = 80
       Height = 20
-      TabOrder = 5
+      TabOrder = 4
-      OnChange = C_specChange
+      OnChange = finishDescriptionChange
     end
     object IOType: TComboBox
       Tag = 2
@@ -268,66 +217,21 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
       Height = 20
       Style = csDropDownList
       DropDownCount = 20
-      TabOrder = 6
+      TabOrder = 5
       OnChange = TBFindClick
       Items.Strings = (
         #21152#24037#20986#24211
         #36864#36824
         '')
     end
-    object C_XINHAO: TEdit
-      Tag = 2
-      Left = 483
-      Top = 35
-      Width = 80
-      Height = 20
-      TabOrder = 7
-      OnChange = C_specChange
-    end
-    object OrderNo: TEdit
-      Tag = 2
-      Left = 636
-      Top = 35
-      Width = 80
-      Height = 20
-      TabOrder = 8
-      OnChange = C_specChange
-    end
-    object FTYNo: TEdit
-      Tag = 2
-      Left = 636
-      Top = 8
-      Width = 80
-      Height = 20
-      TabOrder = 9
-      OnChange = C_specChange
-    end
-    object C_Width: TEdit
-      Tag = 2
-      Left = 756
-      Top = 7
-      Width = 100
-      Height = 20
-      TabOrder = 10
-      OnChange = TBFindClick
-    end
-    object C_GramWeight: TEdit
-      Tag = 2
-      Left = 756
-      Top = 31
-      Width = 100
-      Height = 20
-      TabOrder = 11
-      OnChange = C_specChange
-    end
     object C_ColorDepth: TEdit
       Tag = 2
       Left = 906
       Top = 30
       Width = 100
       Height = 20
-      TabOrder = 12
+      TabOrder = 6
-      OnChange = C_specChange
+      OnChange = finishDescriptionChange
     end
   end
   object cxGrid2: TcxGrid [2]
@@ -338,9 +242,6 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitLeft = -91
-    ExplicitTop = 96
-    ExplicitWidth = 1284
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -442,15 +343,15 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
         Width = 90
       end
       object Tv1Column4: TcxGridDBColumn
-        Caption = #25104#21697#32534#21495
+        Caption = #25104#21697#21517#31216
-        DataBinding.FieldName = 'C_COde'
+        DataBinding.FieldName = 'C_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 81
       end
       object Tv1F_Code: TcxGridDBColumn
-        Caption = #22383#24067#32534#21495
+        Caption = #22383#24067#21517#31216
-        DataBinding.FieldName = 'F_Code'
+        DataBinding.FieldName = 'F_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 80
@@ -607,6 +508,7 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
     Top = 152
   end
   object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = cxGrid2
     PopupMenus = <>
     Left = 1104
     Top = 168

F01染色坯布仓库/U_DyeGreyClothOutList.pas

@@ -46,27 +46,15 @@ type
     TBAdd: TToolButton;
     TBEdit: TToolButton;
     Label3: TLabel;
-    Label4: TLabel;
     Label5: TLabel;
     Label8: TLabel;
     Label12: TLabel;
     C_NAME: TEdit;
-    FTYName: TEdit;
     BCIOID: TEdit;
-    C_spec: TEdit;
+    finishDescription: TEdit;
     IOType: TComboBox;
-    Label9: TLabel;
-    C_XINHAO: TEdit;
-    Label6: TLabel;
-    OrderNo: TEdit;
-    Label7: TLabel;
-    FTYNo: TEdit;
     ToolButton1: TToolButton;
     ToolButton2: TToolButton;
-    Label10: TLabel;
-    Label11: TLabel;
-    C_Width: TEdit;
-    C_GramWeight: TEdit;
     Label14: TLabel;
     C_ColorDepth: TEdit;
     cxGrid2: TcxGrid;
@@ -106,7 +94,7 @@ type
     procedure TBDelClick(Sender: TObject);
     procedure TBAddClick(Sender: TObject);
     procedure TBEditClick(Sender: TObject);
-    procedure C_specChange(Sender: TObject);
+    procedure finishDescriptionChange(Sender: TObject);
     procedure cxTabControl1Change(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
@@ -193,7 +181,7 @@ end;
 
 procedure TfrmDyeGreyClothOutList.ToolButton1Click(Sender: TObject);
 begin
-  WriteCxGrid(trim(Self.Caption), Tv1, 'ȾɫÅ÷²¼²Ö¿â');
+  WriteCxGrid(trim(Self.Caption), Tv1, '坯布出库列表');
 
 end;
 
@@ -259,7 +247,7 @@ end;
 procedure TfrmDyeGreyClothOutList.FormShow(Sender: TObject);
 begin
   inherited;
-  ReadCxGrid(trim(Self.Caption), Tv1, 'ȾɫÅ÷²¼²Ö¿â');
+  ReadCxGrid(trim(Self.Caption), Tv1, '坯布出库列表');
   if canshu1 = '²éѯ' then
   begin
     TBAdd.Visible := false;
@@ -427,7 +415,7 @@ begin
 
 end;
 
-procedure TfrmDyeGreyClothOutList.C_specChange(Sender: TObject);
+procedure TfrmDyeGreyClothOutList.finishDescriptionChange(Sender: TObject);
 begin
   TBFind.Click;
 end;

F01染色坯布仓库/U_DyeGreyClothStkList.dfm

@@ -1,7 +1,7 @@
 inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
   Left = 105
   Top = 131
-  Caption = #24211#23384#36873#25321#21015#34920
+  Caption = #22383#24067#24211#23384#21015#34920
   ClientHeight = 567
   ClientWidth = 1400
   Position = poDefault
@@ -93,101 +93,69 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
     Color = clSkyBlue
     TabOrder = 1
     object Label3: TLabel
-      Left = 355
+      Left = 324
-      Top = 12
+      Top = 14
-      Width = 24
+      Width = 48
       Height = 12
-      Caption = #21697#21517
+      Caption = #25104#21697#21517#31216
-    end
-    object Label4: TLabel
-      Left = 187
-      Top = 12
-      Width = 24
-      Height = 12
-      Caption = #23458#25143
     end
     object Label8: TLabel
-      Left = 497
+      Left = 487
-      Top = 12
+      Top = 14
-      Width = 24
+      Width = 60
       Height = 12
-      Caption = #35268#26684
+      Caption = #21518#25972#29702#25551#36848
     end
     object Label2: TLabel
-      Left = 638
+      Left = 38
-      Top = 12
+      Top = 14
-      Width = 36
+      Width = 48
       Height = 12
-      Caption = #22411'  '#21495
+      Caption = #20837#24211#21333#21495
     end
     object Label5: TLabel
-      Left = 769
+      Left = 183
-      Top = 12
+      Top = 14
-      Width = 36
+      Width = 48
       Height = 12
-      Caption = #19994#21153#21592
+      Caption = #20837#24211#31867#22411
-    end
-    object Label1: TLabel
-      Left = 901
-      Top = 11
-      Width = 24
-      Height = 12
-      Caption = #24211#20301
     end
     object C_name: TEdit
       Tag = 2
-      Left = 382
+      Left = 373
-      Top = 8
+      Top = 10
       Width = 100
       Height = 20
       TabOrder = 0
       OnChange = TBFindClick
     end
-    object FromCoName: TEdit
+    object finishDescription: TEdit
       Tag = 2
-      Left = 216
+      Left = 552
-      Top = 8
+      Top = 10
-      Width = 78
-      Height = 20
-      TabOrder = 1
-      OnChange = FromCoNameChange
-    end
-    object C_spec: TEdit
-      Tag = 2
-      Left = 524
-      Top = 8
       Width = 100
       Height = 20
-      TabOrder = 2
+      TabOrder = 1
       OnChange = TBFindClick
     end
-    object C_XINHAO: TEdit
+    object BCIOID: TEdit
       Tag = 2
-      Left = 677
+      Left = 92
-      Top = 8
+      Top = 10
+      Width = 78
+      Height = 20
+      TabOrder = 2
+      OnChange = FromCoNameChange
+    end
+    object ioType: TEdit
+      Tag = 2
+      Left = 237
+      Top = 10
       Width = 78
       Height = 20
       TabOrder = 3
       OnChange = FromCoNameChange
     end
-    object Saleser: TEdit
-      Tag = 2
-      Left = 808
-      Top = 8
-      Width = 78
-      Height = 20
-      TabOrder = 4
-      OnChange = FromCoNameChange
-    end
-    object StkPosition: TEdit
-      Tag = 2
-      Left = 930
-      Top = 8
-      Width = 78
-      Height = 20
-      TabOrder = 5
-      OnChange = FromCoNameChange
-    end
   end
   object cxGrid2: TcxGrid [2]
     Left = 0
@@ -197,7 +165,6 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitHeight = 398
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -262,7 +229,7 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
         item
           Format = #26465#25968':0'
           Kind = skCount
-          Column = v1Column6
+          Column = Tv1IOTime
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -272,7 +239,21 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
       Styles.Header = DataLink_DyeGreyClothStk.Default
       Styles.Inactive = DataLink_DyeGreyClothStk.SHuangSe
       Styles.Selection = DataLink_DyeGreyClothStk.SHuangSe
-      object v1Column6: TcxGridDBColumn
+      object Tv1lzckordno: TcxGridDBColumn
+        Caption = #26469#36135#21333#21495
+        DataBinding.FieldName = 'lzckordno'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 90
+      end
+      object Tv1BCIOID: TcxGridDBColumn
+        Caption = #20837#24211#21333#21495
+        DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1IOTime: TcxGridDBColumn
         Caption = #20837#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
         DataBinding.IsNullValueType = True
@@ -280,6 +261,114 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
         Options.Editing = False
         Width = 87
       end
+      object Tv1ioType: TcxGridDBColumn
+        Caption = #20837#24211#31867#22411
+        DataBinding.FieldName = 'ioType'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1OrderNo: TcxGridDBColumn
+        Caption = #29983#20135#35746#21333#21495
+        DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 90
+      end
+      object v2Column1: TcxGridDBColumn
+        Tag = 2
+        Caption = #25104#21697#21517#31216
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 124
+      end
+      object Tv1Column4: TcxGridDBColumn
+        Caption = #22383#24067#21517#31216
+        DataBinding.FieldName = 'F_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 71
+      end
+      object v1Column9: TcxGridDBColumn
+        Caption = #20837#24211#25968#37327
+        DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 63
+      end
+      object v2Column6: TcxGridDBColumn
+        Tag = 2
+        Caption = #24211#23384#25968#37327
+        DataBinding.FieldName = 'stkqty'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 74
+      end
+      object Tv1QtyUnit: TcxGridDBColumn
+        Caption = #25968#37327#21333#20301
+        DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object v1Column7: TcxGridDBColumn
+        Caption = #20837#24211#21305#25968
+        DataBinding.FieldName = 'piece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 62
+      end
+      object v1Column1: TcxGridDBColumn
+        Caption = #24211#23384#21305#25968
+        DataBinding.FieldName = 'stkpiece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 69
+      end
+      object v1Column4: TcxGridDBColumn
+        Caption = #25104#21697#38376#24133
+        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 74
+      end
+      object v1Column8: TcxGridDBColumn
+        Tag = 2
+        Caption = #22383#24067#38376#24133
+        DataBinding.FieldName = 'F_Width'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        HeaderGlyphAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 79
+      end
+      object Tv1Material: TcxGridDBColumn
+        Caption = #26448#36136
+        DataBinding.FieldName = 'Material'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 70
+      end
+      object Tv1finishDescription: TcxGridDBColumn
+        Caption = #21518#25972#29702#25551#36848
+        DataBinding.FieldName = 'finishDescription'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 104
+      end
       object v1Column14: TcxGridDBColumn
         Tag = 2
         Caption = #26469#33258#21333#20301
@@ -297,168 +386,13 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
         Options.Editing = False
         Width = 108
       end
-      object v2Column1: TcxGridDBColumn
+      object Tv1Note: TcxGridDBColumn
-        Tag = 2
+        Caption = #22791#27880
-        Caption = #21697#21517
+        DataBinding.FieldName = 'Note'
-        DataBinding.FieldName = 'C_Name'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 124
-      end
-      object v1Column8: TcxGridDBColumn
-        Tag = 2
-        Caption = #35268#26684
-        DataBinding.FieldName = 'C_Spec'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        HeaderGlyphAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 131
-      end
-      object v1Column4: TcxGridDBColumn
-        Caption = #38376#24133
-        DataBinding.FieldName = 'C_Width'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
-      object v1Column5: TcxGridDBColumn
-        Caption = #20811#37325
-        DataBinding.FieldName = 'C_GramWeight'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 70
-      end
-      object Tv1Column4: TcxGridDBColumn
-        Caption = #24037#33402
-        DataBinding.FieldName = 'C_GONGYI'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 71
-      end
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #22411#21495
-        DataBinding.FieldName = 'C_XINHAO'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #26426#21488
-        DataBinding.FieldName = 'C_JITAI'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 69
-      end
-      object v1Column10: TcxGridDBColumn
-        Caption = #25209#21495
-        DataBinding.FieldName = 'BatchNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 124
-      end
-      object v1Column11: TcxGridDBColumn
-        Caption = #19994#21153#21592
-        DataBinding.FieldName = 'Saleser'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 68
-      end
-      object v1Column12: TcxGridDBColumn
-        Caption = #32852#31995#26041#24335
-        DataBinding.FieldName = 'SalesPhone'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 73
-      end
-      object v1Column7: TcxGridDBColumn
-        Caption = #20837#24211#21305#25968
-        DataBinding.FieldName = 'piece'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 62
-      end
-      object v1Column9: TcxGridDBColumn
-        Caption = #20837#24211#25968#37327
-        DataBinding.FieldName = 'Qty'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 63
-      end
-      object v1Column1: TcxGridDBColumn
-        Caption = #24211#23384#21305#25968
-        DataBinding.FieldName = 'stkpiece'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 69
-      end
-      object v2Column6: TcxGridDBColumn
-        Tag = 2
-        Caption = #24211#23384#25968#37327
-        DataBinding.FieldName = 'stkqty'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 74
-      end
-      object v1Column3: TcxGridDBColumn
-        Tag = 2
-        Caption = #21333#20301
-        DataBinding.FieldName = 'QtyUnit'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.DropDownListStyle = lsFixedList
-        Properties.Items.Strings = (
-          'Kg'
-          'M'
-          'Y')
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 51
-      end
-      object Tv1Column2: TcxGridDBColumn
-        Caption = #39068#33394
-        DataBinding.FieldName = 'C_Color'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 69
-      end
-      object Tv1Column1: TcxGridDBColumn
-        Caption = #33394#21035
-        DataBinding.FieldName = 'C_ColorDepth'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 72
-      end
-      object Tv1Column3: TcxGridDBColumn
-        Caption = #24211#20301
-        DataBinding.FieldName = 'StkPosition'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.Buttons = <
-          item
-            Default = True
-            Kind = bkEllipsis
-          end>
-        Properties.OnButtonClick = Tv1Column3PropertiesButtonClick
-        Properties.OnEditValueChanged = Tv1Column3PropertiesEditValueChanged
-        HeaderAlignmentHorz = taCenter
-        Width = 69
-      end
     end
     object cxGrid2Level1: TcxGridLevel
       GridView = Tv1
@@ -493,6 +427,7 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
     Top = 232
   end
   object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = cxGrid2
     PopupMenus = <>
     Left = 536
     Top = 240

F01染色坯布仓库/U_DyeGreyClothStkList.pas

@@ -35,39 +35,33 @@ type
     v2Column1: TcxGridDBColumn;
     v1Column8: TcxGridDBColumn;
     v1Column4: TcxGridDBColumn;
-    v1Column5: TcxGridDBColumn;
+    Tv1Material: TcxGridDBColumn;
-    v1Column10: TcxGridDBColumn;
     v1Column1: TcxGridDBColumn;
     v2Column6: TcxGridDBColumn;
-    v1Column3: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
     Label3: TLabel;
-    Label4: TLabel;
     Label8: TLabel;
     Label2: TLabel;
     C_name: TEdit;
-    FromCoName: TEdit;
+    finishDescription: TEdit;
-    C_spec: TEdit;
+    BCIOID: TEdit;
-    C_XINHAO: TEdit;
+    Tv1IOTime: TcxGridDBColumn;
-    v1Column6: TcxGridDBColumn;
     v1Column7: TcxGridDBColumn;
     v1Column9: TcxGridDBColumn;
-    v1Column11: TcxGridDBColumn;
-    v1Column12: TcxGridDBColumn;
     Label5: TLabel;
-    Saleser: TEdit;
+    ioType: TEdit;
     ToolButton2: TToolButton;
-    Tv1Column1: TcxGridDBColumn;
-    Tv1Column2: TcxGridDBColumn;
-    Tv1Column3: TcxGridDBColumn;
-    Label1: TLabel;
-    StkPosition: TEdit;
     ToolButton1: TToolButton;
     Edit1: TEdit;
     ADOQueryTmp: TADOQuery;
     Tv1Column4: TcxGridDBColumn;
-    Tv1Column5: TcxGridDBColumn;
+    Tv1finishDescription: TcxGridDBColumn;
-    Tv1Column6: TcxGridDBColumn;
+    Tv1lzckordno: TcxGridDBColumn;
+    Tv1BCIOID: TcxGridDBColumn;
+    Tv1ioType: TcxGridDBColumn;
+    Tv1OrderNo: TcxGridDBColumn;
+    Tv1QtyUnit: TcxGridDBColumn;
+    Tv1Note: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBRafreshClick(Sender: TObject);
@@ -168,7 +162,7 @@ end;
 procedure TfrmDyeGreyClothStkList.FormShow(Sender: TObject);
 begin
   inherited;
-  ReadCxGrid(trim(Self.Caption), Tv1, 'ȾɫÅ÷²¼²Ö¿â');
+  ReadCxGrid(trim(Self.Caption), Tv1, 'Å÷²¼¿â´æÁбí');
   InitGrid();
 end;
 
@@ -230,7 +224,7 @@ end;
 
 procedure TfrmDyeGreyClothStkList.ToolButton2Click(Sender: TObject);
 begin
-  WriteCxGrid(trim(Self.Caption), Tv1, 'ȾɫÅ÷²¼²Ö¿â');
+  WriteCxGrid(trim(Self.Caption), Tv1, 'Å÷²¼¿â´æÁбí');
 end;
 
 procedure TfrmDyeGreyClothStkList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);

F01染色坯布仓库/U_DyeGreyClothStkSel.dfm

@@ -178,7 +178,6 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 71
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -287,15 +286,15 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel
         Width = 90
       end
       object Tv1Column4: TcxGridDBColumn
-        Caption = #25104#21697#32534#21495
+        Caption = #25104#21697#21517#31216
-        DataBinding.FieldName = 'C_COde'
+        DataBinding.FieldName = 'C_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 81
       end
       object Tv1F_Code: TcxGridDBColumn
-        Caption = #22383#24067#32534#21495
+        Caption = #22383#24067#21517#31216
-        DataBinding.FieldName = 'F_Code'
+        DataBinding.FieldName = 'F_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 80

F01染色坯布仓库/U_DyePBImport.dfm

@@ -0,0 +1,220 @@
+inherited frmDyePBImport: TfrmDyePBImport
+  Left = 189
+  Top = 138
+  Caption = #22383#24067#20837#24211#23548#20837
+  ClientHeight = 562
+  ClientWidth = 1484
+  Color = clWhite
+  Font.Charset = ANSI_CHARSET
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
+  Position = poMainFormCenter
+  ExplicitWidth = 1500
+  ExplicitHeight = 601
+  PixelsPerInch = 107
+  TextHeight = 21
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1484
+    Height = 30
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 99
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Images = DataLink_DyeGreyClothStk.cxImageList_bar
+    List = True
+    ParentColor = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object TbSelFile: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #36873#25321#25991#20214
+      ImageIndex = 12
+      OnClick = TbSelFileClick
+    end
+    object ToolButton3: TToolButton
+      Left = 174
+      Top = 0
+      AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 14
+      OnClick = ToolButton3Click
+    end
+    object ToolButton2: TToolButton
+      Left = 245
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#25968#25454
+      ImageIndex = 16
+      OnClick = ToolButton2Click
+    end
+    object ToolButton1: TToolButton
+      Left = 348
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = ToolButton1Click
+    end
+    object TBClose: TToolButton
+      Left = 451
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object cxGrid1: TcxGrid [1]
+    Left = 0
+    Top = 30
+    Width = 1484
+    Height = 532
+    Align = alClient
+    TabOrder = 1
+    ExplicitTop = 22
+    object Tv1: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      Navigator.Buttons.Delete.Enabled = False
+      Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DS_1
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsBehavior.GoToNextCellOnEnter = True
+      OptionsCustomize.ColumnFiltering = False
+      OptionsSelection.MultiSelect = True
+      OptionsSelection.CheckBoxVisibility = [cbvDataRow, cbvColumnHeader]
+      OptionsView.GroupByBox = False
+      object v2Column6: TcxGridDBColumn
+        Caption = #29983#20135#35746#21333#21495
+        DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 127
+      end
+      object v2Column15: TcxGridDBColumn
+        Caption = #25968#37327
+        DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 118
+      end
+      object v2Column3: TcxGridDBColumn
+        Caption = #21305#25968
+        DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 111
+      end
+      object v2Column1: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 163
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = Tv1
+    end
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_DyeGreyClothStk.ADOLink
+    Left = 121
+    Top = 160
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_DyeGreyClothStk.ADOLink
+    Left = 249
+    Top = 161
+  end
+  inherited ImageList_new32: TImageList
+    Left = 528
+    Top = 144
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_DyeGreyClothStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 853
+    Top = 193
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_DyeGreyClothStk.ADOLink
+    Parameters = <>
+    Left = 941
+    Top = 201
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_DyeGreyClothStk.ADOLink
+    Parameters = <>
+    Left = 741
+    Top = 201
+  end
+  object GPM_1: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 648
+    Top = 328
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 795
+    Top = 323
+  end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 720
+    Top = 328
+  end
+  object cxStyleRepository1: TcxStyleRepository
+    Left = 600
+    Top = 200
+    PixelsPerInch = 96
+    object cxStyle1: TcxStyle
+      AssignedValues = [svTextColor]
+      TextColor = clRed
+    end
+  end
+  object OpenDialog1: TOpenDialog
+    Left = 226
+    Top = 290
+  end
+  object CDS_LM: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 560
+    Top = 328
+  end
+end

F01染色坯布仓库/U_DyePBImport.pas

@@ -0,0 +1,282 @@
+unit U_DyePBImport;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
+  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
+  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
+  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
+  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
+  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
+  cxTextEdit, cxDropDownEdit, cxPC, U_BaseHelp, cxLookAndFeels,
+  cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, ComObj,
+  U_BaseList, System.ImageList, Vcl.ImgList, dxScrollbarAnnotations,
+  dxSkinsDefaultPainters, dxSkinsCore;
+
+type
+  TfrmDyePBImport = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBClose: TToolButton;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    GPM_1: TcxGridPopupMenu;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
+    OpenDialog1: TOpenDialog;
+    TbSelFile: TToolButton;
+    ToolButton1: TToolButton;
+    ToolButton2: TToolButton;
+    CDS_LM: TClientDataSet;
+    ToolButton3: TToolButton;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v2Column6: TcxGridDBColumn;
+    v2Column15: TcxGridDBColumn;
+    v2Column3: TcxGridDBColumn;
+    v2Column1: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure TbSelFileClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+  private
+    { Private declarations }
+    procedure InitGrid();
+  public
+    { Public declarations }
+    FCTID: string;
+  end;
+
+var
+  frmDyePBImport: TfrmDyePBImport;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_DyeGreyClothInEdit;
+
+{$R *.dfm}
+
+procedure TfrmDyePBImport.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add(' select * from BS_Cloth_IO where 2= 1 ');
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmDyePBImport.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmDyePBImport := nil;
+end;
+
+procedure TfrmDyePBImport.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := cafree;
+
+end;
+
+procedure TfrmDyePBImport.TBCloseClick(Sender: TObject);
+begin
+
+  Close;
+end;
+
+procedure TfrmDyePBImport.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid(self.Caption, Tv1, 'BS_Cloth_IO');
+  with CDS_LM do
+  begin
+    FieldDefs.Clear;
+    FieldDefs.Add('LXH', ftInteger, 0);
+    FieldDefs.Add('lCode', ftString, 40);
+    FieldDefs.Add('LName', ftString, 40);
+    close;
+    CreateDataSet;
+  end;
+  InitGrid();
+end;
+
+procedure TfrmDyePBImport.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmDyePBImport.ToolButton1Click(Sender: TObject);
+begin
+  WriteCxGrid(self.Caption, Tv1, '样品管理');
+end;
+
+procedure TfrmDyePBImport.ToolButton2Click(Sender: TObject);
+begin
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    CDS_1.DisableControls;
+    with CDS_1 do
+    begin
+      First;
+      while not eof do
+      begin
+
+        with frmDyeGreyClothInEdit.CDS_Sub do
+        begin
+
+          Append;
+          FieldByName('OrderNo').Value := Trim(CDS_1.fieldbyname('OrderNo').AsString);
+          FieldByName('Qty').Value := Trim(CDS_1.fieldbyname('Qty').AsString);
+          FieldByName('Piece').Value := Trim(CDS_1.fieldbyname('Piece').AsString);
+          FieldByName('Note').Value := Trim(CDS_1.fieldbyname('Note').AsString);
+          FieldByName('Note').Value := '加工入库';
+          Post;
+        end;
+
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('select A.* from Dye_Plan_Main A  ');
+          sql.add(' where MainId = ' + quotedStr(Trim(CDS_1.fieldbyname('OrderNo').AsString)));
+          open;
+        end;
+        frmDyeGreyClothInEdit.CDS_Sub.edit;
+        frmDyeGreyClothInEdit.CDS_Sub.FieldByName('OrderNo').Value := ADOQueryCmd.fieldbyname('OrderNo').asstring;
+        frmDyeGreyClothInEdit.CDS_Sub.FieldByName('C_Name').Value := ADOQueryCmd.fieldbyname('C_Name').asstring;
+        frmDyeGreyClothInEdit.CDS_Sub.FieldByName('C_Code').Value := ADOQueryCmd.fieldbyname('C_Code').asstring;
+        frmDyeGreyClothInEdit.CDS_Sub.FieldByName('F_Name').Value := ADOQueryCmd.fieldbyname('F_Name').asstring;
+
+        frmDyeGreyClothInEdit.CDS_Sub.FieldByName('finishDescription').Value := ADOQueryCmd.fieldbyname('finishDescription').asstring;
+        frmDyeGreyClothInEdit.CDS_Sub.Post;
+        Next;
+      end;
+    end;
+    Application.MessageBox('导入成功！', '提示信息', MB_OK);
+    ADOQueryCmd.Connection.CommitTrans;
+    CDS_1.EnableControls;
+    close;
+  except
+    CDS_1.EnableControls;
+    ADOQueryCmd.Connection.RollbackTrans;
+
+  end;
+end;
+
+procedure TfrmDyePBImport.ToolButton3Click(Sender: TObject);
+begin
+  CDS_1.Delete;
+end;
+
+procedure TfrmDyePBImport.TbSelFileClick(Sender: TObject);
+var
+  excelApp, WorkBook: Variant;
+  i, j, k, LX, ExcelRowCount: integer;
+  maxId, FCPID, FCPName, t1, t2, t3, FFID: string;
+begin
+
+  try
+    excelApp := CreateOleObject('Excel.Application');
+    openDialog1.Filter := '*.CSV;*.xls';
+    if opendialog1.Execute then
+    begin
+      WorkBook := excelApp.WorkBooks.Open(OpenDialog1.FileName);
+    end
+    else
+      exit;
+    excelApp.Visible := false;
+    ExcelRowCount := WorkBook.WorkSheets[1].UsedRange.Rows.Count;
+  except
+    application.MessageBox('加载EXCEL错误！', '错误信息', MB_ICONERROR);
+    exit;
+  end;
+
+  CDS_LM.EmptyDataSet;
+
+  for j := 0 to Tv1.ColumnCount - 1 do
+  begin
+    with CDS_LM do
+    begin
+      Append;
+      FieldByName('LCode').Value := trim(Tv1.Columns[j].DataBinding.FieldName);
+      FieldByName('LName').Value := trim(Tv1.Columns[j].Caption);
+      Post;
+    end;
+  end;
+
+  try
+    for i := 1 to 50 do
+    begin
+      if trim(WorkBook.WorkSheets[1].Cells[1, i].value) = '' then
+        continue;
+      if CDS_LM.Locate('LName', trim(WorkBook.WorkSheets[1].Cells[1, i].value), []) then
+      begin
+        with CDS_LM do
+        begin
+          Edit;
+          FieldByName('LXH').Value := i;
+          Post;
+        end;
+      end;
+    end;
+  except
+    application.MessageBox('加载数组错误！', '错误信息', MB_ICONERROR);
+    exit;
+  end;
+
+  try
+    for i := 2 to ExcelRowCount do
+    begin
+      with CDS_1 do
+      begin
+        Append;
+        CDS_LM.First;
+        while not CDS_LM.Eof do
+        begin
+          if CDS_LM.FieldByName('LXH').AsInteger > 0 then
+            CDS_1.fieldbyname(CDS_LM.FieldByName('LCode').AsString).Value := WorkBook.WorkSheets[1].Cells[i, CDS_LM.FieldByName('LXH').AsInteger].Value;
+          CDS_LM.Next;
+        end;
+        Post;
+      end;
+    end;
+    WorkBook.Close;
+    excelApp.Quit;
+    excelApp := Unassigned;
+    WorkBook := Unassigned;
+  except
+    WorkBook.Close;
+    excelApp.Quit;
+    excelApp := Unassigned;
+    WorkBook := Unassigned;
+    application.MessageBox('写入数据异常，导入中断！', '错误信息', MB_ICONERROR);
+    exit;
+  end;
+
+end;
+
+end.
+

F01染色坯布仓库/U_DyePlanForCardSel.dfm

@@ -285,6 +285,13 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
+      object Tv1finishDescription: TcxGridDBColumn
+        Caption = #21518#25972#29702#25551#36848
+        DataBinding.FieldName = 'finishDescription'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
       object Tv1F_description: TcxGridDBColumn
         Caption = #22383#24067#25551#36848
         DataBinding.FieldName = 'F_description'

F01染色坯布仓库/U_DyePlanForCardSel.pas

@@ -54,6 +54,7 @@ type
     Label4: TLabel;
     C_Name: TEdit;
     Tv1F_description: TcxGridDBColumn;
+    Tv1finishDescription: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);

F02染色计划单/DyePlan.dpr

@@ -1,4 +1,4 @@
-library DyePlan;
+ library DyePlan;
 
 uses
   SysUtils,
@@ -39,20 +39,21 @@ uses
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
   U_DyeProcessDefin in 'U_DyeProcessDefin.pas' {frmDyeProcessDefin},
   U_ProductInfoSel in '..\A00ͨÓô°Ìå\U_ProductInfoSel.pas' {frmProductInfoSel},
-  U_CraftSel in 'U_CraftSel.pas' {frmCraftSel};
+  U_CraftSel in 'U_CraftSel.pas' {frmCraftSel},
+  U_DyeSimpleTechnicsList in 'U_DyeSimpleTechnicsList.pas' {frmDyeSimpleTechnicsList};
 
 {$R *.res}
 
 procedure DllEnterPoint(dwReason: DWORD); far; stdcall;
 begin
-  DLLProc := @DLLEnterPoint;
+  DLLProc := @DllEnterPoint;
   DllEnterPoint(DLL_PROCESS_ATTACH);
 end;
 
 procedure DLLUnloadProc(Reason: Integer); register;
 begin
-//  if (Reason = DLL_PROCESS_DETACH) or (Reason = DLL_THREAD_DETACH) then
+  // if (Reason = DLL_PROCESS_DETACH) or (Reason = DLL_THREAD_DETACH) then
-//    Application := NewDllApp;
+  // Application := NewDllApp;
 end;
 
 exports
@@ -65,5 +66,5 @@ begin
   except
 
   end;
-end.
 
+end.

F02染色计划单/DyePlan.dproj

@@ -195,6 +195,10 @@
             <Form>frmCraftSel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_DyeSimpleTechnicsList.pas">
+            <Form>frmDyeSimpleTechnicsList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

F02染色计划单/DyePlan.dproj.local

@@ -1,64 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.188,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeProcessDefin.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.037,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_Cust_Cloth_PSC.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.362,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.383,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_CraftSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.213,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas</Transaction>
+    <Transaction>2025/09/28 12:18:54.000.943,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeSimpleTechnicsList.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>
@@ -128,5 +129,7 @@
     <File Path="U_DyeProcessDefin.dfm"/>
     <File Path="U_CraftSel.pas"/>
     <File Path="U_CraftSel.dfm"/>
+    <File Path="U_DyeSimpleTechnicsList.pas"/>
+    <File Path="U_DyeSimpleTechnicsList.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

F02染色计划单/DyePlan.skincfg

@@ -0,0 +1,5 @@
+[ExpressSkins]
+Default=1
+ShowNotifications=1
+Enabled=1
+dxSkinsDefaultPainters=1

F02染色计划单/U_DyePlanCardInput.dfm

@@ -1165,8 +1165,6 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
         Align = alClient
         PopupMenu = PM_1
         TabOrder = 0
-        ExplicitLeft = 2
-        ExplicitTop = 45
         object TV1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>

F02染色计划单/U_DyePlanCardInput.pas

@@ -632,8 +632,8 @@ begin
     end;
     FPCIDS := FPCIDS + maxId + ';';
 
-    if not GetLSNo(ADOQueryCmd, maxno, 'PC', 'BS_Cloth_IO', 3, 1) then
+//    if not GetLSNo(ADOQueryCmd, maxno, 'PC', 'BS_Cloth_IO', 3, 1) then
-      raise Exception.Create('取染色坯布出库编号失败！');
+//      raise Exception.Create('取染色坯布出库编号失败！');
 
     try
       ADOQueryCmd.Connection.BeginTrans;
@@ -647,7 +647,7 @@ begin
         FieldByName('OrderNo').Value := OrderNo.Text;
 //        FieldByName('SubId').Value := CDS_Color.FieldByName('SubId').Value;
         FieldByName('Mainid').Value := FMainid;
-        FieldByName('BCIOID').Value := maxno;
+//        FieldByName('BCIOID').Value := maxno;
         FieldByName('Filler').Value := trim(DName);
         FieldByName('Workshop').Value := trim(FWorkshop);
         FieldByName('PCType').Value := trim(PCType.Text);

F02染色计划单/U_DyePlanInPut.dfm

@@ -256,10 +256,10 @@ object frmDyePlanInPut: TfrmDyePlanInPut
       Width = 121
       Height = 20
       TabOrder = 3
+      Text = #24050#35745#21010
       Items.Strings = (
-        ''
-        #24050#19979#36798
         #24050#35745#21010
+        #24050#19979#36798
         #24050#32467#31639
         #24050#21462#28040)
     end
@@ -373,6 +373,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut
     ParentFont = False
     ShowCaptions = True
     TabOrder = 3
+    ExplicitTop = 315
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -601,8 +602,8 @@ object frmDyePlanInPut: TfrmDyePlanInPut
   object CDS_1: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 792
+    Left = 520
-    Top = 464
+    Top = 456
   end
   object GPM_1: TcxGridPopupMenu
     PopupMenus = <>

F02染色计划单/U_DyePlanInPut.pas

@@ -160,7 +160,7 @@ begin
         Edit;
         FieldByName('MainId').Value := '';
         FieldByName('SubId').Value := '';
-        FieldByName('carNum').Value := 0;
+//        FieldByName('carNum').Value := 0;
         Post;
         Next;
       end;
@@ -187,6 +187,7 @@ begin
 
       Self.C_Name.Text := trim(CDS_1.FieldByName('C_Name').AsString);
       Self.C_Code.Text := trim(CDS_1.FieldByName('C_Code').AsString);
+      Self.F_Name.Text := trim(CDS_1.FieldByName('F_Name').AsString);
 
     end;
     CDS_1.EnableControls;

F02染色计划单/U_DyePlanList.dfm

@@ -2,6 +2,7 @@ inherited frmDyePlanList: TfrmDyePlanList
   Caption = #29983#20135#25351#31034#21333
   ClientHeight = 699
   ClientWidth = 1401
+  ExplicitLeft = -172
   ExplicitWidth = 1417
   ExplicitHeight = 738
   PixelsPerInch = 96
@@ -101,40 +102,56 @@ inherited frmDyePlanList: TfrmDyePlanList
       ImageIndex = 21
       OnClick = TBPrintClick
     end
-    object Tchk: TToolButton
+    object TbXiada: TToolButton
       Left = 663
       Top = 0
       AutoSize = True
-      Caption = #23457#26680
+      Caption = #19979#36798
       ImageIndex = 12
-      OnClick = TchkClick
+      OnClick = TbXiadaClick
     end
-    object Tnochk: TToolButton
+    object TbNoXiada: TToolButton
       Left = 734
       Top = 0
       AutoSize = True
-      Caption = #25764#38144#23457#26680
+      Caption = #25764#38144#19979#36798
       ImageIndex = 11
-      OnClick = TnochkClick
+      OnClick = TbNoXiadaClick
     end
-    object TWC: TToolButton
+    object TbJiesuan: TToolButton
       Left = 829
       Top = 0
       AutoSize = True
-      Caption = #35746#21333#23436#25104
+      Caption = #32467#31639
       ImageIndex = 12
-      OnClick = TWCClick
+      OnClick = TbJiesuanClick
     end
-    object TNowc: TToolButton
+    object TbNoJiesuan: TToolButton
-      Left = 924
+      Left = 900
       Top = 0
       AutoSize = True
-      Caption = #25764#38144#23436#25104
+      Caption = #25764#38144#32467#31639
       ImageIndex = 11
-      OnClick = TNowcClick
+      OnClick = TbNoJiesuanClick
+    end
+    object TbQuxiao: TToolButton
+      Left = 995
+      Top = 0
+      AutoSize = True
+      Caption = #21462#28040
+      ImageIndex = 12
+      OnClick = TbQuxiaoClick
+    end
+    object TbNoQuxiao: TToolButton
+      Left = 1066
+      Top = 0
+      AutoSize = True
+      Caption = #25764#38144#21462#28040
+      ImageIndex = 11
+      OnClick = TbNoQuxiaoClick
     end
     object TBExport: TToolButton
-      Left = 1019
+      Left = 1161
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -142,7 +159,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       OnClick = TBExportClick
     end
     object ToolButton2: TToolButton
-      Left = 1090
+      Left = 1232
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -150,7 +167,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       OnClick = ToolButton2Click
     end
     object TBClose: TToolButton
-      Left = 1185
+      Left = 1327
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -168,6 +185,7 @@ inherited frmDyePlanList: TfrmDyePlanList
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
+    ExplicitTop = 44
     object Label1: TLabel
       Left = 18
       Top = 17
@@ -440,6 +458,7 @@ inherited frmDyePlanList: TfrmDyePlanList
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
     AlignSplitter = salBottom
+    ExplicitTop = 501
   end
   object cxTabControl1: TcxTabControl [4]
     Left = 0
@@ -450,10 +469,10 @@ inherited frmDyePlanList: TfrmDyePlanList
     TabOrder = 4
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
-    Properties.TabIndex = 4
+    Properties.TabIndex = 0
     Properties.Tabs.Strings = (
-      #24050#19979#36798
       #24050#35745#21010
+      #24050#19979#36798
       #24050#32467#31639
       #24050#21462#28040
       #20840#37096)
@@ -484,6 +503,7 @@ inherited frmDyePlanList: TfrmDyePlanList
       Font.Style = []
       ParentFont = False
       TabOrder = 0
+      ExplicitTop = -2
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>

F02染色计划单/U_DyePlanList.pas

@@ -62,10 +62,10 @@ type
     cxSplitter1: TcxSplitter;
     DS_2: TDataSource;
     cxTabControl1: TcxTabControl;
-    Tchk: TToolButton;
+    TbXiada: TToolButton;
-    Tnochk: TToolButton;
+    TbNoXiada: TToolButton;
-    TWC: TToolButton;
+    TbQuxiao: TToolButton;
-    TNowc: TToolButton;
+    TbNoQuxiao: TToolButton;
     v1Column6: TcxGridDBColumn;
     Panel2: TPanel;
     ADOQueryImage: TADOQuery;
@@ -94,6 +94,8 @@ type
     ToolButton3: TToolButton;
     TV2Column1: TcxGridDBColumn;
     Tv1C_PlanQty: TcxGridDBColumn;
+    TbJiesuan: TToolButton;
+    TbNoJiesuan: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -118,15 +120,17 @@ type
     procedure TBcopyClick(Sender: TObject);
     procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
     procedure cxTabControl1Change(Sender: TObject);
-    procedure TchkClick(Sender: TObject);
+    procedure TbXiadaClick(Sender: TObject);
-    procedure TnochkClick(Sender: TObject);
+    procedure TbNoXiadaClick(Sender: TObject);
-    procedure TWCClick(Sender: TObject);
+    procedure TbQuxiaoClick(Sender: TObject);
-    procedure TNowcClick(Sender: TObject);
+    procedure TbNoQuxiaoClick(Sender: TObject);
     procedure Picture4DblClick(Sender: TObject);
     procedure Label3DblClick(Sender: TObject);
     procedure Label9DblClick(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
+    procedure TbJiesuanClick(Sender: TObject);
+    procedure TbNoJiesuanClick(Sender: TObject);
   private
     DQdate: TDateTime;
     procedure InitGrid();
@@ -173,10 +177,13 @@ begin
   tbedit.Enabled := false;       //修改
   tbdel.Enabled := false;        //删除
   TBcopy.Enabled := false;       //复制
-  tchk.Enabled := false;         //审核
+
-  tnochk.Enabled := false;       //撤销审核
+  TbXiada.Enabled := false;
-  twc.Enabled := false;          //完成
+  TbNoXiada.Enabled := false;
-  tNOwc.Enabled := false;        //撤销完成
+  TbJiesuan.Enabled := false;
+  TbNoJiesuan.Enabled := false;
+  TbQuxiao.Enabled := false;
+  TbNoQuxiao.Enabled := false;
 
   if Trim(canshu1) = '管理' then
   begin
@@ -188,19 +195,22 @@ begin
           tbedit.Enabled := true;
           tbdel.Enabled := true;
 
-          twc.Enabled := true;
+          TbXiada.Enabled := true;
         end;
       1:
         begin
-          tNOwc.Enabled := true;
+          TbNoXiada.Enabled := true;
+          TbJiesuan.Enabled := True;
 
         end;
       2:
         begin
-
+          TbNoJiesuan.Enabled := true;
+          TbQuxiao.Enabled := True;
         end;
       3:
         begin
+           TbNoQuxiao.Enabled := True;
         end;
     end;
   end;
@@ -331,11 +341,11 @@ begin
       case cxTabControl1.TabIndex of
         0:
           begin
-            sql.Add('  and  isnull(A.status,''0'') in(''已下达'') ');
+            sql.Add('  and  isnull(A.status,''0'') in(''已计划'') ');
           end;
         1:
           begin
-            sql.Add('  and  isnull(A.status,''0'')in(''已计划'' )');
+            sql.Add('  and  isnull(A.status,''0'')in(''已下达'' )');
           end;
         2:
           begin
@@ -693,6 +703,82 @@ begin
   end;
 end;
 
+procedure TfrmDyePlanList.TbJiesuanClick(Sender: TObject);
+begin
+  if Order_Main.IsEmpty then
+    exit;
+  if not Order_Main.Locate('SSel', True, []) then
+  begin
+    application.MessageBox('请选择数据！', '提示信息', 0);
+    Exit;
+  end;
+  try
+    while Order_Main.Locate('SSel', True, []) do
+    begin
+      with ADOQueryCmd do
+      begin
+        close;
+        sql.Clear;
+        sql.Add('update  Dye_Plan_Main SET status=''已结算'' ');
+        sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
+
+        sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+        sql.Add(' ' + quotedstr(trim(DName)));
+        sql.Add(',getdate() ');
+        sql.Add(',' + quotedstr(trim(self.Caption)));
+        sql.Add(',' + quotedstr(trim('订单结算')));
+        sql.Add(',' + quotedstr(trim('订单号：' + trim(Order_Main.FieldByName('orderNO').AsString))));
+        sql.Add(',' + quotedstr(trim('成功')));
+        sql.Add(')');
+        execsql;
+      end;
+      Order_Main.Delete;
+    end;
+
+    application.MessageBox('订单结算成功！', '提示信息');
+    TBRafresh.Click;
+  except
+    application.MessageBox('订单结算失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmDyePlanList.TbNoJiesuanClick(Sender: TObject);
+begin
+  if Order_Main.IsEmpty then
+    exit;
+  if not Order_Main.Locate('SSel', True, []) then
+  begin
+    application.MessageBox('请选择数据！', '提示信息', 0);
+    Exit;
+  end;
+  try
+    while Order_Main.Locate('SSel', True, []) do
+    begin
+      with ADOQueryCmd do
+      begin
+        close;
+        sql.Clear;
+        sql.Add('update  Dye_Plan_Main SET status=''已下达'' ');
+        sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
+        sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+        sql.Add(' ' + quotedstr(trim(DName)));
+        sql.Add(',getdate() ');
+        sql.Add(',' + quotedstr(trim(self.Caption)));
+        sql.Add(',' + quotedstr(trim('订单撤销结算')));
+        sql.Add(',' + quotedstr(trim('订单号：' + trim(Order_Main.FieldByName('orderNO').AsString))));
+        sql.Add(',' + quotedstr(trim('成功')));
+        sql.Add(')');
+        execsql;
+      end;
+      Order_Main.Delete;
+    end;
+    application.MessageBox('订单撤销结算成功！', '提示信息');
+    TBRafresh.Click;
+  except
+    application.MessageBox('订单撤销结算失败！', '提示信息', 0);
+  end;
+end;
+
 procedure TfrmDyePlanList.TBcopyClick(Sender: TObject);
 begin
   if Order_Main.IsEmpty then
@@ -728,7 +814,7 @@ begin
   InitGrid();
 end;
 
-procedure TfrmDyePlanList.TchkClick(Sender: TObject);
+procedure TfrmDyePlanList.TbXiadaClick(Sender: TObject);
 begin
   if Order_Main.IsEmpty then
     exit;
@@ -744,13 +830,14 @@ begin
       begin
         close;
         sql.Clear;
-        sql.Add('update  Dye_Plan_Main SET status=''9'' ');
+        sql.Add('update  Dye_Plan_Main SET status=''已下达'' ');
         sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
+
         sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
         sql.Add(' ' + quotedstr(trim(DName)));
         sql.Add(',getdate() ');
         sql.Add(',' + quotedstr(trim(self.Caption)));
-        sql.Add(',' + quotedstr(trim('订单审核')));
+        sql.Add(',' + quotedstr(trim('订单下达')));
         sql.Add(',' + quotedstr(trim('订单号：' + trim(Order_Main.FieldByName('orderNO').AsString))));
         sql.Add(',' + quotedstr(trim('成功')));
         sql.Add(')');
@@ -759,14 +846,14 @@ begin
       Order_Main.Delete;
     end;
 
-    application.MessageBox('订单审核成功！', '提示信息');
+    application.MessageBox('订单下达成功！', '提示信息');
     TBRafresh.Click;
   except
-    application.MessageBox('订单审核失败！', '提示信息', 0);
+    application.MessageBox('订单下达失败！', '提示信息', 0);
   end;
 end;
 
-procedure TfrmDyePlanList.TnochkClick(Sender: TObject);
+procedure TfrmDyePlanList.TbNoXiadaClick(Sender: TObject);
 begin
   if Order_Main.IsEmpty then
     exit;
@@ -782,13 +869,13 @@ begin
       begin
         close;
         sql.Clear;
-        sql.Add('update  Dye_Plan_Main SET status=''0'' ');
+        sql.Add('update  Dye_Plan_Main SET status=''已计划'' ');
         sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
         sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
         sql.Add(' ' + quotedstr(trim(DName)));
         sql.Add(',getdate() ');
         sql.Add(',' + quotedstr(trim(self.Caption)));
-        sql.Add(',' + quotedstr(trim('订单撤销审核')));
+        sql.Add(',' + quotedstr(trim('订单撤销下达')));
         sql.Add(',' + quotedstr(trim('订单号：' + trim(Order_Main.FieldByName('orderNO').AsString))));
         sql.Add(',' + quotedstr(trim('成功')));
         sql.Add(')');
@@ -796,14 +883,14 @@ begin
       end;
       Order_Main.Delete;
     end;
-    application.MessageBox('订单撤销审核成功！', '提示信息');
+    application.MessageBox('订单撤销下达成功！', '提示信息');
     TBRafresh.Click;
   except
-    application.MessageBox('订单撤销审核失败！', '提示信息', 0);
+    application.MessageBox('订单撤销下达失败！', '提示信息', 0);
   end;
 end;
 
-procedure TfrmDyePlanList.TWCClick(Sender: TObject);
+procedure TfrmDyePlanList.TbQuxiaoClick(Sender: TObject);
 begin
   if Order_Main.IsEmpty then
     exit;
@@ -819,13 +906,13 @@ begin
       begin
         close;
         sql.Clear;
-        sql.Add('update  Dye_Plan_Main SET status=''10'' ');
+        sql.Add('update  Dye_Plan_Main SET status=''已取消'' ');
         sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
         sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
         sql.Add(' ' + quotedstr(trim(DName)));
         sql.Add(',getdate() ');
         sql.Add(',' + quotedstr(trim(self.Caption)));
-        sql.Add(',' + quotedstr(trim('订单完成')));
+        sql.Add(',' + quotedstr(trim('订单取消')));
         sql.Add(',' + quotedstr(trim('订单号：' + trim(Order_Main.FieldByName('orderNO').AsString))));
         sql.Add(',' + quotedstr(trim('成功')));
         sql.Add(')');
@@ -833,14 +920,14 @@ begin
       end;
       Order_Main.Delete;
     end;
-    application.MessageBox('订单完成成功！', '提示信息');
+    application.MessageBox('订单取消成功！', '提示信息');
     TBRafresh.Click;
   except
-    application.MessageBox('订单完成失败！', '提示信息', 0);
+    application.MessageBox('订单取消失败！', '提示信息', 0);
   end;
 end;
 
-procedure TfrmDyePlanList.TNowcClick(Sender: TObject);
+procedure TfrmDyePlanList.TbNoQuxiaoClick(Sender: TObject);
 begin
   if Order_Main.IsEmpty then
     exit;
@@ -856,13 +943,13 @@ begin
       begin
         close;
         sql.Clear;
-        sql.Add('update  Dye_Plan_Main SET status=''9'' ');
+        sql.Add('update  Dye_Plan_Main SET status=''已结算'' ');
         sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
         sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
         sql.Add(' ' + quotedstr(trim(DName)));
         sql.Add(',getdate() ');
         sql.Add(',' + quotedstr(trim(self.Caption)));
-        sql.Add(',' + quotedstr(trim('订单撤销完成')));
+        sql.Add(',' + quotedstr(trim('订单撤销取消')));
         sql.Add(',' + quotedstr(trim('订单号：' + trim(Order_Main.FieldByName('orderNO').AsString))));
         sql.Add(',' + quotedstr(trim('成功')));
         sql.Add(')');

F02染色计划单/U_DyeProcessDefin.pas

@@ -438,31 +438,16 @@ type
     fp_upperNeedle: TcxTextEdit;
     fp_UpSuperRate: TcxTextEdit;
     Panel_gj: TPanel;
-    TbGJReplace2: TcxButton;
-    TbGJClear2: TcxButton;
     TbGJReplace1: TcxButton;
     TbGjClear1: TcxButton;
     cxLabel233: TcxLabel;
-    cxLabel234: TcxLabel;
-    cxLabel235: TcxLabel;
-    cxLabel236: TcxLabel;
-    cxLabel237: TcxLabel;
-    cxLabel238: TcxLabel;
-    cxLabel239: TcxLabel;
-    cxLabel240: TcxLabel;
     cxLabel241: TcxLabel;
     cxLabel242: TcxLabel;
     cxLabel243: TcxLabel;
     cxLabel244: TcxLabel;
     cxLabel245: TcxLabel;
     cxLabel246: TcxLabel;
-    cxLabel247: TcxLabel;
     cxLabel248: TcxLabel;
-    cxLabel249: TcxLabel;
-    cxLabel250: TcxLabel;
-    cxLabel251: TcxLabel;
-    cxLabel252: TcxLabel;
-    cxLabel253: TcxLabel;
     cxLabel254: TcxLabel;
     cxLabel255: TcxLabel;
     cxLabel256: TcxLabel;
@@ -482,7 +467,6 @@ type
     cxLabel270: TcxLabel;
     cxLabel271: TcxLabel;
     cxLabel272: TcxLabel;
-    cxLabel273: TcxLabel;
     cxLabel274: TcxLabel;
     cxLabel275: TcxLabel;
     cxLabel276: TcxLabel;
@@ -511,23 +495,10 @@ type
     gj_rowWind2: TcxTextEdit;
     gj_rowWind3: TcxTextEdit;
     gj_rowWind4: TcxTextEdit;
-    gj_speed: TcxTextEdit;
-    gj_temperature1: TcxTextEdit;
-    gj_temperature10: TcxTextEdit;
-    gj_temperature11: TcxTextEdit;
-    gj_temperature2: TcxTextEdit;
-    gj_temperature3: TcxTextEdit;
-    gj_temperature4: TcxTextEdit;
-    gj_temperature5: TcxTextEdit;
-    gj_temperature6: TcxTextEdit;
-    gj_temperature7: TcxTextEdit;
-    gj_temperature8: TcxTextEdit;
-    gj_temperature9: TcxTextEdit;
     gj_TubePress: TcxTextEdit;
     gj_tubeTemper: TcxTextEdit;
     gj_upperNeedle: TcxTextEdit;
     gj_UpSuperRate: TcxTextEdit;
-    gj_WidthAmplitude: TcxTextEdit;
     Panel_fs: TPanel;
     TbFSReplace1: TcxButton;
     TbFSClear1: TcxButton;
@@ -798,6 +769,38 @@ type
     Tv6Column2: TcxGridDBColumn;
     Tv2Column2: TcxGridDBColumn;
     Tv2Column3: TcxGridDBColumn;
+    TbGJReplace2: TcxButton;
+    TbGJClear2: TcxButton;
+    cxLabel234: TcxLabel;
+    cxLabel235: TcxLabel;
+    cxLabel236: TcxLabel;
+    cxLabel237: TcxLabel;
+    cxLabel238: TcxLabel;
+    cxLabel247: TcxLabel;
+    cxLabel249: TcxLabel;
+    cxLabel250: TcxLabel;
+    cxLabel251: TcxLabel;
+    cxLabel252: TcxLabel;
+    cxLabel253: TcxLabel;
+    cxLabel273: TcxLabel;
+    gj_temperature1: TcxTextEdit;
+    gj_temperature10: TcxTextEdit;
+    gj_temperature11: TcxTextEdit;
+    gj_temperature2: TcxTextEdit;
+    gj_temperature3: TcxTextEdit;
+    gj_temperature4: TcxTextEdit;
+    gj_temperature5: TcxTextEdit;
+    gj_temperature6: TcxTextEdit;
+    gj_temperature7: TcxTextEdit;
+    gj_temperature8: TcxTextEdit;
+    gj_temperature9: TcxTextEdit;
+    cxLabel239: TcxLabel;
+    cxLabel240: TcxLabel;
+    gj_speed: TcxTextEdit;
+    cxLabel278: TcxLabel;
+    gj_number: TcxTextEdit;
+    fp_gjNumber: TcxTextEdit;
+    cxLabel279: TcxLabel;
     procedure FormShow(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure TbSaveClick(Sender: TObject);
@@ -1068,10 +1071,6 @@ var
 begin
   InitGrid();
   ArrangeTabsByDataset();
-  if (BtnInt = 0) and (frmDyeTechnicsinput.CDS_1.FieldByName('PSID').Value = '') then  //新增
-  begin
-    FPSID := '';
-  end;
 
   with ADOQueryTemp do
   begin
@@ -1123,15 +1122,6 @@ begin
     SCSHData(ADOQueryTemp, Panel_zm, 2);
   end;
 
-  if BtnInt = 2 then  //复制
-  begin
-//    FPSID := '';
-//    PSName.Text := '';
-  end;
-  if ((BtnInt = 1) or (BtnInt = 0)) and (frmDyeTechnicsinput.CDS_1.FieldByName('PSID').AsString <> '') then   //修改
-  begin
-//    PSName.Enabled := False;
-  end;
   if BtnInt = 3 then   //²é¿´
   begin
     TbSave.Visible := False;
@@ -1182,24 +1172,24 @@ begin
     Exit;
   end;
 
-  if  frmDyeTechnicsinput.CDS_1.FieldByName('DTMID').AsString <> '' then///复制 和 新增
+//  if  frmDyeTechnicsinput.CDS_1.FieldByName('DTMID').AsString <> '' then///复制 和 新增
-  begin
+//  begin
-//    FPSID := '';
+////    FPSID := '';
-    with ADOQueryCmd do
+//    with ADOQueryCmd do
-    begin
+//    begin
-      Close;
+//      Close;
-      SQL.Clear;
+//      SQL.Clear;
-      sql.Add('select * from Dye_Process where PSName=''' + trim(PSName.Text) + '''');
+//      sql.Add('select * from Dye_Process where PSName=''' + trim(PSName.Text) + '''');
-      sql.Add(' and DTMID = '+ QuotedStr(Trim(frmDyeTechnicsinput.CDS_1.FieldByName('DTMID').AsString)));
+//      sql.Add(' and DTMID = '+ QuotedStr(Trim(frmDyeTechnicsinput.CDS_1.FieldByName('DTMID').AsString)));
-      Open;
+//      Open;
-    end;
+//    end;
-    if ADOQueryCmd.RecordCount > 1 then
+//    if ADOQueryCmd.RecordCount > 1 then
-    begin
+//    begin
-      application.MessageBox(PChar('工序名称''' + trim(PSName.text) + '''已存在'), '提示');
+//      application.MessageBox(PChar('工序名称''' + trim(PSName.text) + '''已存在'), '提示');
-      Result := false;
+//      Result := false;
-      Exit;
+//      Exit;
-    end;
+//    end;
-  end;
+//  end;
   Result := True;
 end;
 
@@ -1295,9 +1285,53 @@ begin
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_fs, 2);
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_gj, 2);
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_fp, 2);
+
+//      if FPSType = '轧毛' then
+//      begin
+//        ADOQueryCmd.FieldByName('All_Speed').Value := StrToFloat(zm_inout.Text);
+//      end
+//      else if FPSType = '长车清洗' then
+//      begin
+//         ADOQueryCmd.FieldByName('All_Speed').Value := StrToFloat(ccqx_speed.Text);
+//      end
+//      else if FPSType = '卷染缸清洗' then
+//      begin
+//         ADOQueryCmd.FieldByName('All_Speed').Value := StrToFloat(rgqx_speed.Text);
+//      end
+//      else if FPSType = '机缸清洗' then
+//      begin
+////         jgqx_keepTemper.Text
+////         jgqx_upperSpeed.Text
+////         jgqx_keepTime.Text
+////         jgqx_downSpeed.Text
+//         ADOQueryCmd.FieldByName('All_Speed').Value :=
+//         (StrToFloat(jgqx_keepTemper.Text) - 40)/StrToFloat(jgqx_upperSpeed.Text)
+//          + StrToFloat(jgqx_keepTime.Text)
+//          + (StrToFloat(jgqx_keepTemper.Text) - 40)/StrToFloat(jgqx_downSpeed.Text);
+//      end
+//      else if FPSType = '干定型' then
+//      begin
+//         ADOQueryCmd.FieldByName('All_Speed').Value := StrToFloat(dx_speed.Text);
+//      end
+//      else if FPSType = '下水定型' then
+//      begin
+//         ADOQueryCmd.FieldByName('All_Speed').Value := StrToFloat(fs_speed.Text);
+//      end
+//      else if FPSType = '刮胶' then
+//      begin
+//         ADOQueryCmd.FieldByName('All_Speed').Value := StrToFloat(gj_speed.Text);
+//      end
+//      else if FPSType = '发泡' then
+//      begin
+//         ADOQueryCmd.FieldByName('All_Speed').Value := StrToFloat(fp_speed.Text);
+//      end;
+
       Post;
     end;
 
+
+
+
 ////////////////       ±£´æÖ÷±í½áÊø          //////////////////////
 ///
 /////

F02染色计划单/U_DyeSimpleTechnicsList.pas

@@ -0,0 +1,920 @@
+unit U_DyeSimpleTechnicsList;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
+  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
+  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
+  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
+  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
+  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
+  cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
+  dxBarBuiltInMenu, Menus, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters,
+  dxDateRanges, dxScrollbarAnnotations, cxContainer, cxDropDownEdit, cxLabel,
+  cxButtons, cxMemo;
+
+type
+  TfrmDyeSimpleTechnicsList = class(TfrmBaseList)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBDel: TToolButton;
+    TBClose: TToolButton;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    Panel1: TPanel;
+    ToolButton2: TToolButton;
+    Label1: TLabel;
+    DTMName: TEdit;
+    ADOQueryMain: TADOQuery;
+    Label3: TLabel;
+    DTMNo: TEdit;
+    GPM_2: TcxGridPopupMenu;
+    DS_2: TDataSource;
+    CDS_2: TClientDataSet;
+    cxTabControl1: TcxTabControl;
+    Tchk: TToolButton;
+    TNochk: TToolButton;
+    DS_PsType: TDataSource;
+    CDS_PSType: TClientDataSet;
+    ADOQuery1: TADOQuery;
+    GPM_1: TcxGridPopupMenu;
+    ToolButton3: TToolButton;
+    ToolButton1: TToolButton;
+    ToolButton4: TToolButton;
+    ToolButton5: TToolButton;
+    Panel2: TPanel;
+    cxGrid2: TcxGrid;
+    Tv2: TcxGridDBTableView;
+    v2Ssel: TcxGridDBColumn;
+    v2GYNO: TcxGridDBColumn;
+    v2GYName: TcxGridDBColumn;
+    v2GYGX: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    Splitter1: TSplitter;
+    ScrollBox1: TScrollBox;
+    Panel_GJ: TPanel;
+    Label9: TLabel;
+    cxLabel240: TcxLabel;
+    gj_speed: TcxTextEdit;
+    cxLabel278: TcxLabel;
+    gj_number: TcxTextEdit;
+    TbGJReplace2: TcxButton;
+    TbGJClear2: TcxButton;
+    cxLabel234: TcxLabel;
+    cxLabel236: TcxLabel;
+    cxLabel237: TcxLabel;
+    cxLabel238: TcxLabel;
+    cxLabel247: TcxLabel;
+    cxLabel249: TcxLabel;
+    cxLabel250: TcxLabel;
+    cxLabel251: TcxLabel;
+    cxLabel252: TcxLabel;
+    cxLabel253: TcxLabel;
+    cxLabel273: TcxLabel;
+    gj_temperature1: TcxTextEdit;
+    gj_temperature10: TcxTextEdit;
+    gj_temperature11: TcxTextEdit;
+    gj_temperature2: TcxTextEdit;
+    gj_temperature3: TcxTextEdit;
+    gj_temperature4: TcxTextEdit;
+    gj_temperature5: TcxTextEdit;
+    gj_temperature6: TcxTextEdit;
+    gj_temperature7: TcxTextEdit;
+    gj_temperature8: TcxTextEdit;
+    gj_temperature9: TcxTextEdit;
+    cxGrid8: TcxGrid;
+    TvGJ: TcxGridDBTableView;
+    cxGridDBColumn24: TcxGridDBColumn;
+    cxGridDBColumn25: TcxGridDBColumn;
+    cxGridDBColumn26: TcxGridDBColumn;
+    cxGridDBColumn27: TcxGridDBColumn;
+    cxGridDBColumn28: TcxGridDBColumn;
+    cxGridLevel7: TcxGridLevel;
+    cxLabel9: TcxLabel;
+    Panel_FP: TPanel;
+    Label10: TLabel;
+    cxLabel290: TcxLabel;
+    fp_speed: TcxTextEdit;
+    fp_gjNumber: TcxTextEdit;
+    cxLabel279: TcxLabel;
+    TbFPReplace2: TcxButton;
+    TbFPClear2: TcxButton;
+    cxLabel284: TcxLabel;
+    cxLabel286: TcxLabel;
+    cxLabel287: TcxLabel;
+    cxLabel288: TcxLabel;
+    cxLabel297: TcxLabel;
+    cxLabel299: TcxLabel;
+    cxLabel300: TcxLabel;
+    cxLabel301: TcxLabel;
+    cxLabel302: TcxLabel;
+    cxLabel303: TcxLabel;
+    cxLabel323: TcxLabel;
+    fp_temperature1: TcxTextEdit;
+    fp_temperature10: TcxTextEdit;
+    fp_temperature11: TcxTextEdit;
+    fp_temperature2: TcxTextEdit;
+    fp_temperature3: TcxTextEdit;
+    fp_temperature4: TcxTextEdit;
+    fp_temperature5: TcxTextEdit;
+    fp_temperature6: TcxTextEdit;
+    fp_temperature7: TcxTextEdit;
+    fp_temperature8: TcxTextEdit;
+    fp_temperature9: TcxTextEdit;
+    cxGrid6: TcxGrid;
+    TvFP: TcxGridDBTableView;
+    cxGridDBColumn14: TcxGridDBColumn;
+    cxGridDBColumn15: TcxGridDBColumn;
+    cxGridDBColumn16: TcxGridDBColumn;
+    cxGridDBColumn17: TcxGridDBColumn;
+    cxGridDBColumn18: TcxGridDBColumn;
+    cxGridLevel5: TcxGridLevel;
+    cxLabel8: TcxLabel;
+    Panel_zm: TPanel;
+    Label2: TLabel;
+    Label11: TLabel;
+    zm_inout: TcxTextEdit;
+    zm_style: TcxComboBox;
+    cxLabel336: TcxLabel;
+    zm_mainElec: TcxTextEdit;
+    cxLabel344: TcxLabel;
+    zm_needleHigh: TcxTextEdit;
+    cxLabel342: TcxLabel;
+    Panel_ccqx: TPanel;
+    Label4: TLabel;
+    cxLabel113: TcxLabel;
+    ccqx_speed: TcxTextEdit;
+    ccqx_temperature1: TcxTextEdit;
+    ccqx_temperature2: TcxTextEdit;
+    ccqx_temperature3: TcxTextEdit;
+    ccqx_temperature4: TcxTextEdit;
+    ccqx_temperature5: TcxTextEdit;
+    ccqx_temperature6: TcxTextEdit;
+    TbCCQXReplace: TcxButton;
+    TbccqxClear: TcxButton;
+    cxLabel41: TcxLabel;
+    cxLabel42: TcxLabel;
+    cxLabel45: TcxLabel;
+    cxLabel46: TcxLabel;
+    cxLabel47: TcxLabel;
+    cxLabel48: TcxLabel;
+    cxGrid4: TcxGrid;
+    TvCCQX: TcxGridDBTableView;
+    cxGridDBColumn2: TcxGridDBColumn;
+    cxGridDBColumn4: TcxGridDBColumn;
+    Tv1ccqx_use: TcxGridDBColumn;
+    Tv1ccqx_rate: TcxGridDBColumn;
+    cxGridDBColumn6: TcxGridDBColumn;
+    cxGridLevel4: TcxGridLevel;
+    cxLabel1: TcxLabel;
+    Panel_rgqx: TPanel;
+    Label5: TLabel;
+    cxLabel114: TcxLabel;
+    cxLabel150: TcxLabel;
+    cxLabel165: TcxLabel;
+    rgqx_daoSet: TcxTextEdit;
+    rgqx_speed: TcxTextEdit;
+    rgqx_waterTemper: TcxTextEdit;
+    cxGrid3: TcxGrid;
+    TvRG: TcxGridDBTableView;
+    cxGridDBColumn1: TcxGridDBColumn;
+    cxGridDBColumn3: TcxGridDBColumn;
+    cxGridDBColumn5: TcxGridDBColumn;
+    cxGridDBColumn7: TcxGridDBColumn;
+    cxGridDBColumn8: TcxGridDBColumn;
+    cxGridLevel2: TcxGridLevel;
+    cxLabel2: TcxLabel;
+    Panel_jgqx: TPanel;
+    Label6: TLabel;
+    cxLabel340: TcxLabel;
+    jgqx_keepTemper: TcxTextEdit;
+    jgqx_keepTime: TcxTextEdit;
+    cxLabel347: TcxLabel;
+    cxLabel173: TcxLabel;
+    cxLabel334: TcxLabel;
+    jgqx_upperSpeed: TcxTextEdit;
+    jgqx_downSpeed: TcxTextEdit;
+    cxGrid5: TcxGrid;
+    TvJG: TcxGridDBTableView;
+    cxGridDBColumn9: TcxGridDBColumn;
+    cxGridDBColumn10: TcxGridDBColumn;
+    cxGridDBColumn11: TcxGridDBColumn;
+    cxGridDBColumn12: TcxGridDBColumn;
+    cxGridDBColumn13: TcxGridDBColumn;
+    cxGridLevel3: TcxGridLevel;
+    cxLabel3: TcxLabel;
+    Panel_dx: TPanel;
+    Label7: TLabel;
+    cxLabel4: TcxLabel;
+    dx_speed: TcxTextEdit;
+    cxLabel21: TcxLabel;
+    cxLabel23: TcxLabel;
+    cxLabel24: TcxLabel;
+    cxLabel25: TcxLabel;
+    cxLabel6: TcxLabel;
+    cxLabel61: TcxLabel;
+    cxLabel62: TcxLabel;
+    cxLabel63: TcxLabel;
+    cxLabel64: TcxLabel;
+    cxLabel65: TcxLabel;
+    dx_temperature1: TcxTextEdit;
+    dx_temperature5: TcxTextEdit;
+    dx_temperature9: TcxTextEdit;
+    dx_temperature6: TcxTextEdit;
+    dx_temperature3: TcxTextEdit;
+    dx_temperature4: TcxTextEdit;
+    dx_temperature7: TcxTextEdit;
+    dx_temperature8: TcxTextEdit;
+    dx_temperature10: TcxTextEdit;
+    dx_temperature2: TcxTextEdit;
+    TbDXReplace2: TcxButton;
+    TbDXClear2: TcxButton;
+    cxLabel189: TcxLabel;
+    dx_temperature11: TcxTextEdit;
+    cxLabel5: TcxLabel;
+    Panel_FS: TPanel;
+    Label8: TLabel;
+    cxLabel198: TcxLabel;
+    fs_speed: TcxTextEdit;
+    FS_Style: TcxComboBox;
+    fs_isVacuun: TcxComboBox;
+    TbFSReplace2: TcxButton;
+    TBFScLEAR2: TcxButton;
+    cxLabel192: TcxLabel;
+    cxLabel194: TcxLabel;
+    cxLabel195: TcxLabel;
+    cxLabel196: TcxLabel;
+    cxLabel205: TcxLabel;
+    cxLabel207: TcxLabel;
+    cxLabel208: TcxLabel;
+    cxLabel209: TcxLabel;
+    cxLabel210: TcxLabel;
+    cxLabel211: TcxLabel;
+    cxLabel231: TcxLabel;
+    fs_temperature1: TcxTextEdit;
+    fs_temperature10: TcxTextEdit;
+    fs_temperature11: TcxTextEdit;
+    fs_temperature2: TcxTextEdit;
+    fs_temperature3: TcxTextEdit;
+    fs_temperature4: TcxTextEdit;
+    fs_temperature5: TcxTextEdit;
+    fs_temperature6: TcxTextEdit;
+    fs_temperature7: TcxTextEdit;
+    fs_temperature8: TcxTextEdit;
+    fs_temperature9: TcxTextEdit;
+    cxGrid7: TcxGrid;
+    TvFS: TcxGridDBTableView;
+    cxGridDBColumn19: TcxGridDBColumn;
+    cxGridDBColumn20: TcxGridDBColumn;
+    cxGridDBColumn21: TcxGridDBColumn;
+    cxGridDBColumn22: TcxGridDBColumn;
+    cxGridDBColumn23: TcxGridDBColumn;
+    cxGridLevel6: TcxGridLevel;
+    cxLabel7: TcxLabel;
+    Splitter2: TSplitter;
+    Panel3: TPanel;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid9: TcxGrid;
+    Tv3: TcxGridDBTableView;
+    cxGridLevel8: TcxGridLevel;
+    cxButton1: TcxButton;
+    cxButton2: TcxButton;
+    cxButton3: TcxButton;
+    cxButton4: TcxButton;
+    cxButton5: TcxButton;
+    cxButton6: TcxButton;
+    cxButton7: TcxButton;
+    cxButton8: TcxButton;
+    cxButton9: TcxButton;
+    cxButton10: TcxButton;
+    cxButton11: TcxButton;
+    cxButton12: TcxButton;
+    Tv1PSType: TcxGridDBColumn;
+    CDS_GX: TClientDataSet;
+    DS_GX: TDataSource;
+    Tv3PSNO: TcxGridDBColumn;
+    Tv3PSType: TcxGridDBColumn;
+    Tv3PSName: TcxGridDBColumn;
+    Tv3PSID: TcxGridDBColumn;
+    CDS_CCQX: TClientDataSet;
+    DS_CCQX: TDataSource;
+    CDS_RGQX: TClientDataSet;
+    DS_rgqx: TDataSource;
+    CDS_JGQX: TClientDataSet;
+    CDS_fS: TClientDataSet;
+    CDS_gj: TClientDataSet;
+    CDS_FP: TClientDataSet;
+    DS_jgqx: TDataSource;
+    DS_FS: TDataSource;
+    DS_gj: TDataSource;
+    DS_FP: TDataSource;
+    zm_Precautions: TcxMemo;
+    ccqx_note: TcxMemo;
+    rgqx_note: TcxMemo;
+    jgqx_note: TcxMemo;
+    dx_Precautions: TcxMemo;
+    fs_Precautions: TcxMemo;
+    gj_Precautions: TcxMemo;
+    fp_Precautions: TcxMemo;
+    Tv2DTMID: TcxGridDBColumn;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure TBDelClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure DTMNoChange(Sender: TObject);
+    procedure TchkClick(Sender: TObject);
+    procedure TNochkClick(Sender: TObject);
+    procedure cxTabControl1Change(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure ToolButton4Click(Sender: TObject);
+    procedure ToolButton5Click(Sender: TObject);
+    procedure cxGridDBColumn1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure Tv2FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
+    procedure ButtonEdit(Sender: TObject; AButtonIndex: Integer);
+    procedure Tv1DblClick(Sender: TObject);
+  private
+    { Private declarations }
+
+    procedure InitGrid();
+    procedure SetStatus();
+
+    procedure InitPSTypeGrid();
+    procedure InitGlide();
+    procedure InitGXDetails();
+  public
+    fmanage: string;
+  end;
+
+var
+  frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp, U_DyeTechnicsinput, U_DyeProcessDefin;
+
+{$R *.dfm}
+
+procedure TfrmDyeSimpleTechnicsList.SetStatus();
+var
+  i: integer;
+begin
+
+  Tchk.Visible := false;
+  TNochk.Visible := false;
+  TBDel.Visible := false;
+
+  Panel_zm.Visible := False;
+  Panel_ccqx.Visible := False;
+  Panel_rgqx.Visible := False;
+  Panel_jgqx.Visible := False;
+  Panel_dx.Visible := False;
+  Panel_FS.Visible := False;
+  Panel_GJ.Visible := False;
+  Panel_FP.Visible := False;
+
+//  for i := 0 to tv2.ColumnCount - 1 do
+//  begin
+//    if uppercase(tv2.Columns[i].DataBinding.FieldName) <> 'SSEL' then
+//      tv2.Columns[i].Options.Editing := false;
+//  end;
+  if cxTabControl1.TabIndex = 0 then
+  begin
+    Tchk.Visible := true;
+    TBDel.Visible := true;
+  end;
+  if cxTabControl1.TabIndex = 1 then
+  begin
+    TNochk.Visible := true;
+  end;
+  if cxTabControl1.TabIndex = 2 then
+  begin
+
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add(' select * FROM Dye_Technics_Main');
+      if cxTabControl1.TabIndex < 2 then
+        sql.Add(' where isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' ');
+      ShowMessage(SQL.Text);
+      Open;
+
+    end;
+
+    SCreateCDS(ADOQueryMain, CDS_2);
+    SInitCDSData(ADOQueryMain, CDS_2);
+    ShowMessage(ADOQueryMain.FieldByName('DTMID').AsString);
+//    ShowMessage(CDS_2.FieldByName('DTMID').AsString);
+  finally
+    ADOQueryMain.EnableControls;
+
+    //CDS_1.EmptyDataSet;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.InitPSTypeGrid();
+begin
+  try
+    ADOQueryCMD.DisableControls;
+    with ADOQueryCMD do
+    begin
+//      Filtered := False;
+      Close;
+      SQL.Clear;
+      sql.Add(' select *,PSXH=0 from Dye_Technics ');
+      Open;
+    end;
+//    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryCMD, CDS_PSType);
+    SInitCDSData(ADOQueryCMD, CDS_PSType);
+  finally
+    ADOQueryCMD.EnableControls;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.InitGlide();
+begin
+  try
+    ADOQueryTemp.DisableControls;
+    with ADOQueryTemp do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add(' select A.* FROM V_Dye_Technics_Details A');
+      sql.Add(' Where A.DTMID=''' + trim(CDS_2.fieldbyname('DTMID').AsString) + '''');
+      SQL.Add(' ORDER BY A.PSNO');
+      Open;
+    end;
+    SCreateCDS(ADOQueryTemp, CDS_GX);
+    SInitCDSData(ADOQueryTemp, CDS_GX);
+  finally
+    ADOQueryTemp.EnableControls;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.InitGXDetails();
+begin
+  try
+    ADOQueryTemp.DisableControls;
+    CDS_GX.First;
+    while not CDS_GX.eof do
+    begin
+
+      with ADOQueryTemp do
+      begin
+        Close;
+        SQL.Clear;
+        sql.Add(' select A.* FROM V_Dye_Technics_Details A');
+        sql.Add(' Where A.PSID=''' + trim(CDS_GX.fieldbyname('PSID').AsString) + '''');
+//        SQL.Add(' and A.PSID = ''' + trim(CDS_2.fieldbyname('PSID').AsString) + '''');
+        Open;
+      end;
+      with ADOQueryCmd do
+      begin
+        Close;
+        SQL.Clear;
+        sql.Add(' select A.* FROM BS_Cloth_GY_Sub A');
+        sql.Add(' Where A.PSID=''' + trim(CDS_GX.fieldbyname('PSID').AsString) + '''');
+//        SQL.Add(' and A.PSID = ''' + trim(CDS_2.fieldbyname('PSID').AsString) + '''');
+        Open;
+      end;
+//      ShowMessage(IntToStr(ADOQueryCmd.RecordCount));
+
+      if CDS_GX.FieldByName('PSType').AsString = '长车清洗' then
+      begin
+        Panel_ccqx.Visible := True;
+        SCSHData(ADOQueryTemp, Panel_ccqx, 2);
+        ccqx_note.Lines.Text := ADOQueryTemp.FieldByName('ccqx_note').AsString;
+
+        SCreateCDS(ADOQueryCmd, CDS_CCQX);
+        SInitCDSData(ADOQueryCmd, CDS_CCQX);
+
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = '卷染缸清洗' then
+      begin
+        Panel_rgqx.Visible := True;
+        SCSHData(ADOQueryTemp, Panel_rgqx, 2);
+        rgqx_note.Lines.Text := ADOQueryTemp.FieldByName('rgqx_note').AsString;
+
+        SCreateCDS(ADOQueryCmd, CDS_rgQX);
+        SInitCDSData(ADOQueryCmd, CDS_RGQX);
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = '机缸清洗' then
+      begin
+        Panel_jgqx.Visible := True;
+        SCSHData(ADOQueryTemp, Panel_jgqx, 2);
+        jgqx_note.Lines.Text := ADOQueryTemp.FieldByName('jgqx_note').AsString;
+
+        SCreateCDS(ADOQueryCmd, CDS_JGQX);
+        SInitCDSData(ADOQueryCmd, CDS_JGQX);
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = '干定型' then
+      begin
+        Panel_dx.Visible := True;
+        SCSHData(ADOQueryTemp, Panel_dx, 2);
+        dx_Precautions.Lines.Text := ADOQueryTemp.FieldByName('dx_Precautions').AsString;
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = '下水定型' then
+      begin
+        Panel_fs.Visible := True;
+        SCSHData(ADOQueryTemp, Panel_fs, 2);
+        fs_Precautions.Lines.Text := ADOQueryTemp.FieldByName('fs_Precautions').AsString;
+
+        SCreateCDS(ADOQueryCmd, CDS_fS);
+        SInitCDSData(ADOQueryCmd, CDS_fS);
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = '发泡' then
+      begin
+        Panel_fp.Visible := True;
+        SCSHData(ADOQueryTemp, Panel_fp, 2);
+        fp_Precautions.Lines.Text := ADOQueryTemp.FieldByName('fp_Precautions').AsString;
+
+        SCreateCDS(ADOQueryCmd, CDS_FP);
+        SInitCDSData(ADOQueryCmd, CDS_FP);
+
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = '刮胶' then
+      begin
+        Panel_gj.Visible := True;
+        SCSHData(ADOQueryTemp, Panel_gj, 2);
+        gj_Precautions.Lines.Text := ADOQueryTemp.FieldByName('gj_Precautions').AsString;
+
+        SCreateCDS(ADOQueryCmd, CDS_GJ);
+        SInitCDSData(ADOQueryCmd, CDS_GJ);
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = '轧毛' then
+      begin
+        Panel_zm.Visible := True;
+        SCSHData(ADOQueryTemp, Panel_zm, 2);
+        zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
+      end;
+      CDS_GX.Next;
+    end;
+
+  finally
+    ADOQueryTemp.EnableControls;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmDyeSimpleTechnicsList := nil;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.TBCloseClick(Sender: TObject);
+begin
+
+  Close;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.TBDelClick(Sender: TObject);
+begin
+  if CDS_2.IsEmpty then
+    Exit;
+  if CDS_2.Locate('ssel', true, []) = false then
+  begin
+    Application.MessageBox('没有选择数据!', '提示', 0);
+    Exit;
+  end;
+
+  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with CDS_2 do
+    begin
+      DisableControls;
+      First;
+      while not eof do
+      begin
+        if Fieldbyname('ssel').AsBoolean then
+        begin
+          with ADOQueryCmd do
+          begin
+            close;
+            sql.Clear;
+            sql.Add('delete Dye_Technics_Main where DTMID=''' + Trim(CDS_2.fieldbyname('DTMID').AsString) + '''');
+            sql.Add('delete Dye_Technics_Sub where  DTMID=''' + Trim(CDS_2.fieldbyname('DTMID').AsString) + '''');
+
+            execsql;
+          end;
+//          CDS_1.First;
+//          while not CDS_1.Eof do
+//          begin
+//            with ADOQueryCmd do
+//            begin
+//              close;
+//              sql.Clear;
+//              sql.Add('delete Dye_Process where PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + '''');
+//              sql.Add('delete BS_Cloth_GY_Sub where  PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + '''');
+//              sql.Add('delete BS_Cloth_GY_Main where  PSID=''' + Trim(CDS_1.fieldbyname('PSID').AsString) + '''');
+//
+//              execsql;
+//            end;
+//            CDS_1.Next;
+//          end;
+        end;
+        next;
+      end;
+      First;
+      EnableControls;
+    end;
+    InitGrid();
+    ADOQueryCmd.Connection.CommitTrans;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox('操作失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, '工艺管理');
+  ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, '工艺管理');
+  SetStatus();
+  InitGrid();
+end;
+
+procedure TfrmDyeSimpleTechnicsList.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmDyeSimpleTechnicsList.ToolButton1Click(Sender: TObject);
+var
+  maxno: string;
+begin
+  CDS_2.Append;
+  tv2.Columns[1].Options.Editing := true;
+  tv2.Columns[2].Options.Editing := true;
+
+end;
+
+procedure TfrmDyeSimpleTechnicsList.ToolButton2Click(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_2);
+    SInitCDSData(ADOQueryMain, CDS_2);
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.ToolButton3Click(Sender: TObject);
+begin
+  WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, '工艺管理');
+  WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, '工艺管理');
+end;
+
+procedure TfrmDyeSimpleTechnicsList.ToolButton4Click(Sender: TObject);
+begin
+  try
+    frmDyeTechnicsinput := TfrmDyeTechnicsinput.Create(Application);
+    with frmDyeTechnicsinput do
+    begin
+      PState := '修改';
+      FDTMID := Trim(self.CDS_2.fieldbyname('DTMID').AsString);
+      if ShowModal = 1 then
+      begin
+        TBRafresh.Click;
+      end;
+    end;
+  finally
+    frmDyeTechnicsinput.Free;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.ToolButton5Click(Sender: TObject);
+begin
+  try
+    frmDyeTechnicsinput := TfrmDyeTechnicsinput.Create(Application);
+    with frmDyeTechnicsinput do
+    begin
+      PState := '复制';
+      FDTMID := Trim(self.CDS_2.fieldbyname('DTMID').AsString);
+      if ShowModal = 1 then
+      begin
+        TBRafresh.Click;
+      end;
+    end;
+  finally
+    frmDyeTechnicsinput.Free;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.Tv1DblClick(Sender: TObject);
+begin
+
+  with CDS_GX do
+  begin
+    Append;
+    FieldByName('PSNO').Value := CDS_GX.RecordCount + 1;
+    FieldByName('PSType').Value := CDS_PSType.fieldbyname('PSType').AsString;
+    FieldByName('PSId').Value := '';
+    post;
+  end;
+
+end;
+
+procedure TfrmDyeSimpleTechnicsList.Tv2FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
+begin
+  SetStatus();
+  InitGlide();
+  InitGXDetails();
+//  ShowMessage(CDS_2.FieldByName('DTMID').AsString);
+  if (CDS_2.FieldByName('DTMID').AsString = '') or (CDS_2.FieldByName('DTMID').AsString = null) then
+  begin
+    InitPSTypeGrid();
+  end
+  else
+  begin
+    ADOQueryCMD.DisableControls;
+    with ADOQueryCMD do
+    begin
+//      Filtered := False;
+      Close;
+      SQL.Clear;
+      sql.Add(' select *,PSXH=0 from Dye_Technics where 1 = 2 ');
+      Open;
+    end;
+//    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryCMD, CDS_PSType);
+    SInitCDSData(ADOQueryCMD, CDS_PSType);
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.ButtonEdit(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
+    with frmDyeProcessDefin do
+    begin
+      FPSType := self.CDS_GX.FieldByName('PSType').Value;
+      FPSID := Self.CDS_GX.FieldByName('PSID').Value;
+      BtnInt := 3;//查看
+      TbSave.visible := false;
+      TbUpFile.Visible := False;
+      if ShowModal = 1 then
+      begin
+
+      end;
+    end;
+
+  finally
+    frmDyeProcessDefin.Free;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.DTMNoChange(Sender: TObject);
+begin
+  ToolButton2.Click;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.TchkClick(Sender: TObject);
+begin
+  if CDS_2.IsEmpty then
+    exit;
+
+  if CDS_2.Locate('ssel', true, []) = false then
+  begin
+    Application.MessageBox('没有选择数据!', '提示', 0);
+    Exit;
+  end;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with CDS_2 do
+    begin
+      DisableControls;
+      First;
+      while not eof do
+      begin
+        if Fieldbyname('ssel').AsBoolean then
+        begin
+          with ADOQueryCmd do
+          begin
+            close;
+            sql.Clear;
+            sql.Add('update Dye_Technics_Main SET status=''1'' ');
+            sql.Add('where DTMID =' + quotedstr(trim(CDS_2.fieldbyname('DTMID').AsString)));
+            execsql;
+          end;
+        end;
+        next;
+      end;
+      First;
+      EnableControls;
+    end;
+
+    InitGrid();
+    ADOQueryCmd.Connection.CommitTrans;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox('操作失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.TNochkClick(Sender: TObject);
+begin
+  if CDS_2.IsEmpty then
+    exit;
+
+  if CDS_2.Locate('ssel', true, []) = false then
+  begin
+    Application.MessageBox('没有选择数据!', '提示', 0);
+    Exit;
+  end;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with CDS_2 do
+    begin
+      DisableControls;
+      First;
+      while not eof do
+      begin
+        if Fieldbyname('ssel').AsBoolean then
+        begin
+          with ADOQueryCmd do
+          begin
+            close;
+            sql.Clear;
+            sql.Add('update Dye_Technics_Main SET status=''0'' ');
+            sql.Add('where DTMID =' + quotedstr(trim(CDS_2.fieldbyname('DTMID').AsString)));
+            execsql;
+          end;
+        end;
+        next;
+      end;
+      First;
+      EnableControls;
+    end;
+    InitGrid();
+    ADOQueryCmd.Connection.CommitTrans;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox('操作失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.cxGridDBColumn1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmDyeProcessDefin := TfrmDyeProcessDefin.Create(Application);
+    with frmDyeProcessDefin do
+    begin
+//      FPSType := self.CDS_1.FieldByName('PSType').Value;
+//      FPSID := Self.CDS_1.FieldByName('PSID').Value;
+      BtnInt := 3;//查看
+      TbSave.visible := false;
+      TbUpFile.Visible := False;
+      if ShowModal = 1 then
+      begin
+
+      end;
+    end;
+
+  finally
+    frmDyeProcessDefin.Free;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.cxTabControl1Change(Sender: TObject);
+begin
+  SetStatus();
+  InitGrid();
+end;
+
+procedure TfrmDyeSimpleTechnicsList.FormCreate(Sender: TObject);
+begin
+  inherited;
+  fmanage := Trim(DParameters1);
+end;
+
+end.
+

F02染色计划单/U_DyeTechnicsList.dfm

@@ -3,16 +3,22 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
   Top = 106
   Caption = #24037#33402#30331#35760
   ClientHeight = 593
-  ClientWidth = 1455
+  ClientWidth = 1467
-  ExplicitWidth = 1471
+  ExplicitWidth = 1483
   ExplicitHeight = 632
   PixelsPerInch = 96
   TextHeight = 12
-  object ToolBar1: TToolBar [0]
+  object Splitter1: TSplitter [0]
+    Left = 809
+    Top = 99
+    Height = 494
+    ExplicitLeft = 825
+  end
+  object ToolBar1: TToolBar [1]
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1455
+    Width = 1467
     Height = 38
     AutoSize = True
     ButtonHeight = 38
@@ -106,10 +112,10 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
       OnClick = TBCloseClick
     end
   end
-  object Panel1: TPanel [1]
+  object Panel1: TPanel [2]
     Left = 0
     Top = 38
-    Width = 1455
+    Width = 1467
     Height = 38
     Align = alTop
     BevelInner = bvRaised
@@ -149,15 +155,14 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
       OnChange = DTMNoChange
     end
   end
-  object cxGrid2: TcxGrid [2]
+  object cxGrid2: TcxGrid [3]
     Left = 0
     Top = 99
-    Width = 1217
+    Width = 809
     Height = 494
     Align = alLeft
     TabOrder = 2
-    ExplicitLeft = -6
+    ExplicitLeft = 8
-    ExplicitTop = 105
     object Tv2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -185,6 +190,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
       OptionsCustomize.ColumnFiltering = False
       OptionsData.Deleting = False
       OptionsData.DeletingConfirmation = False
+      OptionsView.ColumnAutoWidth = True
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       Styles.Header = DataLink_DyePlan.FonePurple
@@ -225,17 +231,17 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
-        Width = 528
+        Width = 251
       end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = Tv2
     end
   end
-  object cxTabControl1: TcxTabControl [3]
+  object cxTabControl1: TcxTabControl [4]
     Left = 0
     Top = 76
-    Width = 1455
+    Width = 1467
     Height = 23
     Align = alTop
     TabOrder = 3
@@ -248,13 +254,13 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 23
-    ClientRectRight = 1455
+    ClientRectRight = 1467
     ClientRectTop = 19
   end
-  object cxGrid1: TcxGrid [4]
+  object cxGrid1: TcxGrid [5]
-    Left = 1217
+    Left = 812
     Top = 99
-    Width = 238
+    Width = 655
     Height = 494
     Align = alClient
     TabOrder = 4
@@ -274,6 +280,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
       OptionsCustomize.ColumnSorting = False
       OptionsData.Deleting = False
       OptionsData.DeletingConfirmation = False
+      OptionsView.CellAutoHeight = True
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       Styles.IncSearch = DataLink_DyePlan.SHuangSe
@@ -310,19 +317,32 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
+      object TV1All_Detail: TcxGridDBColumn
+        Caption = #24037#24207#21442#25968
+        DataBinding.FieldName = 'All_Detail'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 90
+      end
+      object TV1All_zhuji: TcxGridDBColumn
+        Caption = #21161#21058#20449#24687
+        DataBinding.FieldName = 'All_zhuji'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object TV1ALL_NOTE: TcxGridDBColumn
+        Caption = #24037#24207#22791#27880
+        DataBinding.FieldName = 'ALL_NOTE'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 90
+      end
     end
     object cxGridLevel2: TcxGridLevel
       GridView = TV1
     end
   end
-  object cxSplitter1: TcxSplitter [5]
-    Left = 1217
-    Top = 99
-    Width = 0
-    Height = 494
-    AlignSplitter = salRight
-    Control = cxGrid2
-  end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_DyePlan.ADOLink
     Left = 281

F02染色计划单/U_DyeTechnicsList.pas

@@ -53,12 +53,15 @@ type
     CDS_1: TClientDataSet;
     ADOQuery1: TADOQuery;
     GPM_1: TcxGridPopupMenu;
-    cxSplitter1: TcxSplitter;
     ToolButton3: TToolButton;
     ToolButton1: TToolButton;
     ToolButton4: TToolButton;
     ToolButton5: TToolButton;
     TV1PSID: TcxGridDBColumn;
+    Splitter1: TSplitter;
+    TV1All_Detail: TcxGridDBColumn;
+    TV1ALL_NOTE: TcxGridDBColumn;
+    TV1All_zhuji: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -104,7 +107,7 @@ begin
     begin
       Close;
       SQL.Clear;
-      sql.Add(' select A.*,B.* FROM Dye_Technics_Sub A inner join Dye_Process B on A.PSId=B.PSId ');
+      sql.Add(' select A.* FROM V_Dye_Technics_Details A');
       sql.Add(' Where A.DTMID=''' + trim(CDS_2.fieldbyname('DTMID').AsString) + '''');
       SQL.Add(' ORDER BY A.PSNO');
       Open;

F02染色计划单/U_DyeTechnicsinput.dfm

@@ -120,6 +120,7 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput
       Align = alRight
       TabOrder = 2
       Visible = False
+      ExplicitLeft = -124
       object Tv3: TcxGridDBTableView
         OnDblClick = Tv3DblClick
         Navigator.Buttons.CustomButtons = <>
@@ -242,7 +243,7 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput
           HeaderAlignmentHorz = taCenter
           Width = 130
         end
-        object TV1Column1: TcxGridDBColumn
+        object TV1PSID: TcxGridDBColumn
           DataBinding.FieldName = 'PSID'
           DataBinding.IsNullValueType = True
           Visible = False

F02染色计划单/U_DyeTechnicsinput.pas

@@ -18,7 +18,7 @@ uses
   Vcl.ImgList, cxButtons;
 
 type
-  TfrmDyeTechnicsinput = class(TfrmBaseinput)
+  TfrmDyeTechnicsinput = class(TfrmBaseInput)
     ADOQueryTemp: TADOQuery;
     ADOQueryCmd: TADOQuery;
     ADOQueryMain: TADOQuery;
@@ -71,7 +71,7 @@ type
     TV1DTMID: TcxGridDBColumn;
     TV1DTMName: TcxGridDBColumn;
     Tv3DTMName: TcxGridDBColumn;
-    TV1Column1: TcxGridDBColumn;
+    TV1PSID: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -176,11 +176,11 @@ begin
   with ADOQueryTemp do
   begin
     Close;
-    SQL.Clear;
+      SQL.Clear;
-    sql.Add(' select A.*,B.* FROM Dye_Technics_Sub A inner join Dye_Process B on A.PSId=B.PSId ');
+      sql.Add(' select A.*,B.* FROM Dye_Technics_Sub A inner join Dye_Process B on A.PSId=B.PSId ');
-    sql.Add(' Where A.DTMID=''' + FDTMID + '''');
+      sql.Add(' Where A.DTMID=''' + trim(FDTMID) + '''');
-    SQL.Add(' ORDER BY A.PSNO');
+      SQL.Add(' ORDER BY A.PSNO');
-    Open;
+      Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_1);
   SInitCDSData(ADOQueryTemp, CDS_1);
@@ -346,24 +346,26 @@ begin
     if ADOQueryCmd.RecordCount > 0 then
       raise Exception.Create('¹¤ÒÕÃû³ÆÖظ´!');
 
-    with ADOQueryCmd do
+//    with ADOQueryCmd do
-    begin
+//    begin
-      Close;
+//      Close;
-      sql.Clear;
+//      sql.Clear;
 //    sql.Add('SELECT PSName,COUNT(*) AS DuplicateCount FROM Dye_Process WHERE DTMNo =''' + Trim(DTMNo.Text) + '''');
 //    sql.Add(' GROUP BY PSName HAVING COUNT(*) > 1 ORDER BY DuplicateCount DESC;');
-      sql.Add('SELECT STRING_AGG(PSName, '', '') AS DuplicatePSNames,');
+
-      sql.Add('COUNT(*) AS TotalPSName');
+
-      sql.Add('FROM (SELECT PSName');
+//      sql.Add('SELECT STRING_AGG(PSName, '', '') AS DuplicatePSNames,');
-      sql.Add('FROM Dye_Process');
+//      sql.Add('COUNT(*) AS TotalPSName');
-      sql.Add('WHERE DTMID = ''' + Trim(maxno) + '''');
+//      sql.Add('FROM (SELECT PSName');
-      sql.Add('GROUP BY PSName');
+//      sql.Add('FROM Dye_Process');
-      sql.Add('HAVING COUNT(*) > 1) AS Duplicates HAVING Count(*)>0;');
+//      sql.Add('WHERE DTMID = ''' + Trim(maxno) + '''');
-      Open;
+//      sql.Add('GROUP BY PSName');
-//    showMessage(sql.Text);
+//      sql.Add('HAVING COUNT(*) > 1) AS Duplicates HAVING Count(*)>0;');
-    end;
+//      Open;
-    if ADOQueryCmd.RecordCount > 0 then
+////    showMessage(sql.Text);
-      raise Exception.Create('工序' + ADOQueryCmd.FieldByName('DuplicatePSNames').AsString + '重复!');
+//    end;
+//    if ADOQueryCmd.RecordCount > 0 then
+//      raise Exception.Create('¹¤Ðò' + ADOQueryCmd.FieldByName('DuplicatePSNames').AsString + 'Öظ´!');
 
     if fPSIDList <> '' then
     begin
@@ -672,26 +674,7 @@ begin
     with frmDyeProcessDefin do
     begin
       FPSType := self.CDS_1.FieldByName('PSType').Value;
-      if (PState = '新增') and (Self.CDS_1.FieldByName('PSID').Value = '') then
+      FPSID := Self.CDS_1.FieldByName('PSID').Value;
-      begin
-        FPSID := '';
-        BtnInt := 0;////新增
-      end
-      else if PState = '修改' then
-      begin
-        FPSID := Self.CDS_1.FieldByName('PSID').Value;
-        BtnInt := 1;///修改
-      end
-      else if (PState = '复制') then
-      begin
-        FPSID := Self.CDS_1.FieldByName('PSID').Value;
-        BtnInt := 2;///复制
-      end
-      else
-      begin
-        FPSID := Self.CDS_1.FieldByName('PSID').Value;
-        BtnInt := 0;//新增回改
-      end;
 
       if ShowModal = 1 then
       begin

F02染色计划单/U_GetDllForm.pas

@@ -16,7 +16,7 @@ implementation
 
 uses
   U_DataLink, U_iniParam, U_DyePlanList, U_DyePlanCardList, U_DyeTechnicsList,
-  U_DyeProcessList, U_DyeCardList, U_PSC_Card, U_Cust_Cloth_PSC;
+  U_DyeProcessList, U_DyeCardList, U_PSC_Card, U_Cust_Cloth_PSC,U_DyeSimpleTechnicsList;
 
        /////////////////////////////////////////////////////////////////
       //         功能说明:取Dll中得窗体                              //
@@ -125,6 +125,18 @@ begin
   /////////////////////
   //调用子模块窗口
   case FormID of
+    101:  //¼òÒ×¹¤ÒÕ¹ÜÀí
+      begin
+        with TfrmDyeSimpleTechnicsList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
+        begin
+          fFormID := FormID;
+          FormStyle := mstyle;
+          WindowState := mstate;
+          BorderStyle := mborderstyle;
+          mnewHandle := Handle;
+        end;
+      end;
+
     111:  //工序管理
       begin
         with TfrmDyeProcessList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
@@ -148,6 +160,9 @@ begin
         end;
       end;
 
+
+
+
     131:  //染色生产计划单
       begin
         with TfrmDyePlanList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //

F04染色刷卡/DyeProcess.dpr

@@ -23,7 +23,9 @@ uses
   U_DyePCList in 'U_DyePCList.pas' {frmDyePCList},
   U_DyeOutput in 'U_DyeOutput.pas' {frmDyeOutput},
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
-  U_MachTaskList in 'U_MachTaskList.pas' {frmMachTaskList};
+  U_MachTaskList in 'U_MachTaskList.pas' {frmMachTaskList},
+  U_BS_MachineSel in 'U_BS_MachineSel.pas' {frmBS_MachineSel},
+  U_DyeProcessDefin in 'U_DyeProcessDefin.pas' {frmDyeProcessDefin};
 
 {$R *.res}
 

F04染色刷卡/DyeProcess.dproj

@@ -131,6 +131,14 @@
             <Form>frmMachTaskList</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_BS_MachineSel.pas">
+            <Form>frmBS_MachineSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_DyeProcessDefin.pas">
+            <Form>frmDyeProcessDefin</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

F04染色刷卡/DyeProcess.dproj.local

@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.620,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_MachTaskList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>2025-09-11 15:02:11.620,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_MachTaskList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>2025/09/13 17:08:13.000.517,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_BS_MachineSel.pas</Transaction>
+    <Transaction>2025/09/25 15:07:18.000.836,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeProcessDefin.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>
@@ -59,5 +61,9 @@
     <File Path="U_DyePCList.dfm"/>
     <File Path="U_MachTaskList.pas"/>
     <File Path="U_MachTaskList.dfm"/>
+    <File Path="U_BS_MachineSel.pas"/>
+    <File Path="U_BS_MachineSel.dfm"/>
+    <File Path="U_DyeProcessDefin.pas"/>
+    <File Path="U_DyeProcessDefin.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

F04染色刷卡/U_BS_MachineSel.dfm

@@ -0,0 +1,253 @@
+object frmBS_MachineSel: TfrmBS_MachineSel
+  Left = -8
+  Top = -8
+  Caption = #35745#21010#21333#36873#25321
+  ClientHeight = 613
+  ClientWidth = 1370
+  Color = clWhite
+  Font.Charset = GB2312_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -12
+  Font.Name = #23435#20307
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poDesktopCenter
+  WindowState = wsMaximized
+  OnClose = FormClose
+  OnDestroy = FormDestroy
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1370
+    Height = 38
+    AutoSize = True
+    ButtonHeight = 38
+    ButtonWidth = 91
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -12
+    Font.Name = #23435#20307
+    Font.Style = []
+    Images = DataLink_DyeProcess.ImageList_new32
+    List = True
+    ParentColor = False
+    ParentFont = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object TBFind: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      Visible = False
+      OnClick = TBFindClick
+    end
+    object ToolButton3: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
+      Caption = #36873#25321
+      ImageIndex = 12
+      OnClick = ToolButton3Click
+    end
+    object ToolButton1: TToolButton
+      Left = 213
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = ToolButton1Click
+    end
+    object TBClose: TToolButton
+      Left = 308
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 38
+    Width = 1370
+    Height = 43
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clSkyBlue
+    TabOrder = 1
+    object Label3: TLabel
+      Left = 28
+      Top = 17
+      Width = 52
+      Height = 12
+      Caption = #35745#21010#21333#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label4: TLabel
+      Left = 260
+      Top = 17
+      Width = 52
+      Height = 12
+      Caption = #25104#21697#21517#31216
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object OrderNo: TEdit
+      Tag = 2
+      Left = 85
+      Top = 13
+      Width = 149
+      Height = 20
+      TabOrder = 0
+      OnKeyPress = OrderNoKeyPress
+    end
+    object C_Name: TEdit
+      Tag = 2
+      Left = 317
+      Top = 13
+      Width = 149
+      Height = 20
+      TabOrder = 1
+      OnKeyPress = OrderNoKeyPress
+    end
+  end
+  object cxGrid1: TcxGrid
+    Left = 0
+    Top = 81
+    Width = 1370
+    Height = 532
+    Align = alClient
+    PopupMenu = PopupMenu1
+    TabOrder = 2
+    object Tv1: TcxGridDBTableView
+      OnDblClick = Tv1DblClick
+      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DataSource1
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsCustomize.ColumnFiltering = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      OptionsView.Indicator = True
+      object v1Column4: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        Properties.NullStyle = nssUnchecked
+        HeaderAlignmentHorz = taCenter
+        Width = 44
+      end
+      object Tv1OrderNo: TcxGridDBColumn
+        Caption = #26426#21488#21495
+        DataBinding.FieldName = 'MCNO'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Focusing = False
+        Width = 72
+      end
+      object Tv1C_CodeName: TcxGridDBColumn
+        Caption = #26426#21488#31867#22411
+        DataBinding.FieldName = 'MCType'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Focusing = False
+        Width = 82
+      end
+      object v1Column3: TcxGridDBColumn
+        Caption = #20844#26020#25968
+        DataBinding.FieldName = 'PRTOrderKgQty'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 52
+      end
+    end
+    object cxGrid1Level1: TcxGridLevel
+      GridView = Tv1
+    end
+  end
+  object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 544
+    Top = 176
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_DyeProcess.ADOLink
+    Parameters = <>
+    Left = 344
+    Top = 312
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_DyeProcess.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 432
+    Top = 326
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_DyeProcess.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 224
+    Top = 296
+  end
+  object DataSource1: TDataSource
+    DataSet = Order_Main
+    Left = 464
+    Top = 168
+  end
+  object Order_Main: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 760
+    Top = 232
+  end
+  object PopupMenu1: TPopupMenu
+    Left = 640
+    Top = 192
+    object N1: TMenuItem
+      Caption = #20840#36873
+      OnClick = N1Click
+    end
+    object N2: TMenuItem
+      Caption = #20840#24323
+      OnClick = N2Click
+    end
+  end
+end

F04染色刷卡/U_BS_MachineSel.pas

@@ -0,0 +1,189 @@
+unit U_BS_MachineSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData,
+  cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, DB, cxDBData, ADODB,
+  cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
+  cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
+  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxLookAndFeels,
+  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, cxPC, dxSkinsCore,
+  dxSkinsDefaultPainters, dxDateRanges, dxScrollbarAnnotations;
+
+type
+  TfrmBS_MachineSel = class(TForm)
+    ToolBar1: TToolBar;
+    TBClose: TToolButton;
+    Panel1: TPanel;
+    Tv1: TcxGridDBTableView;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid1: TcxGrid;
+    cxGridPopupMenu1: TcxGridPopupMenu;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    DataSource1: TDataSource;
+    Label3: TLabel;
+    OrderNo: TEdit;
+    Tv1OrderNo: TcxGridDBColumn;
+    Order_Main: TClientDataSet;
+    Tv1C_CodeName: TcxGridDBColumn;
+    ToolButton3: TToolButton;
+    v1Column4: TcxGridDBColumn;
+    v1Column3: TcxGridDBColumn;
+    PopupMenu1: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    TBRafresh: TToolButton;
+    TBFind: TToolButton;
+    ToolButton1: TToolButton;
+    Label4: TLabel;
+    C_Name: TEdit;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+//    procedure OrderNoKeyPress(Sender: TObject; var Key: Char);
+    procedure Tv1DblClick(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+    procedure N2Click(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure TBFindClick(Sender: TObject);
+    procedure cxTabControl1Change(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure OrderNoKeyPress(Sender: TObject; var Key: Char);
+  private
+    DQdate: TDateTime;
+    procedure InitGrid();
+    procedure InitForm();
+    { Private declarations }
+  public
+    FFInt, FCloth: Integer;
+    fWorkshop: string;
+    { Public declarations }
+  end;
+
+var
+  frmBS_MachineSel: TfrmBS_MachineSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmBS_MachineSel.FormDestroy(Sender: TObject);
+begin
+  frmBS_MachineSel := nil;
+end;
+
+procedure TfrmBS_MachineSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  Action := caFree;
+end;
+
+procedure TfrmBS_MachineSel.TBCloseClick(Sender: TObject);
+begin
+  Close;
+
+end;
+
+procedure TfrmBS_MachineSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      Filtered := False;
+      sql.Clear;
+      sql.Add('select A.*   ');
+      sql.add('from BS_Machine A');
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, Order_Main);
+    SInitCDSData(ADOQueryMain, Order_Main);
+  finally
+    ADOQueryMain.EnableControls;
+    Tbfind.Click;
+  end;
+end;
+
+procedure TfrmBS_MachineSel.InitForm();
+begin
+  ReadCxGrid('机台列表选择', Tv1, '机台列表选择');
+  InitGrid();
+end;
+
+procedure TfrmBS_MachineSel.FormShow(Sender: TObject);
+begin
+
+  InitForm();
+  if FFInt = 1 then
+  begin
+    v1Column4.Visible := False;
+    v1Column4.Hidden := True;
+  end;
+//  InitGrid();
+end;
+
+procedure TfrmBS_MachineSel.ToolButton1Click(Sender: TObject);
+begin
+  WriteCxGrid('机台列表选择', Tv1, '机台列表选择');
+end;
+
+procedure TfrmBS_MachineSel.ToolButton3Click(Sender: TObject);
+begin
+  if Order_Main.IsEmpty then
+    exit;
+  ModalResult := 1;
+end;
+
+
+procedure TfrmBS_MachineSel.Tv1DblClick(Sender: TObject);
+begin
+  ToolButton3.Click;
+end;
+
+procedure TfrmBS_MachineSel.N1Click(Sender: TObject);
+begin
+  SelOKNo(Order_Main, True);
+end;
+
+procedure TfrmBS_MachineSel.N2Click(Sender: TObject);
+begin
+  SelOKNo(Order_Main, false);
+end;
+
+procedure TfrmBS_MachineSel.OrderNoKeyPress(Sender: TObject;
+  var Key: Char);
+begin
+  InitGrid();
+end;
+
+procedure TfrmBS_MachineSel.TBRafreshClick(Sender: TObject);
+begin
+  initgrid();
+end;
+
+procedure TfrmBS_MachineSel.TBFindClick(Sender: TObject);
+begin
+  if ADOQueryMain.Active = False then
+    Exit;
+  SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+  SCreateCDS(ADOQueryMain, Order_Main);
+  SInitCDSData(ADOQueryMain, Order_Main);
+end;
+
+procedure TfrmBS_MachineSel.cxTabControl1Change(Sender: TObject);
+begin
+  TBRafresh.Click;
+end;
+
+end.
+

F04染色刷卡/U_DyePCList.dfm

@@ -1,14 +1,15 @@
 inherited frmDyePCList: TfrmDyePCList
   Caption = #25490#20135#20449#24687
   ClientHeight = 584
-  ClientWidth = 1145
+  ClientWidth = 1180
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Height = -11
   Font.Name = 'Tahoma'
   OldCreateOrder = True
   WindowState = wsMaximized
-  ExplicitWidth = 1161
+  ExplicitLeft = -329
+  ExplicitWidth = 1196
   ExplicitHeight = 623
   PixelsPerInch = 96
   TextHeight = 13
@@ -16,11 +17,11 @@ inherited frmDyePCList: TfrmDyePCList
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1145
+    Width = 1180
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 96
+    ButtonWidth = 97
     Caption = 'ToolBar1'
     Color = clSkyBlue
     DisabledImages = DataLink_DyeProcess.ImageList_new32
@@ -76,7 +77,7 @@ inherited frmDyePCList: TfrmDyePCList
       OnClick = TBExportClick
     end
     object ToolButton1: TToolButton
-      Left = 408
+      Left = 409
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -84,7 +85,7 @@ inherited frmDyePCList: TfrmDyePCList
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 503
+      Left = 504
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -95,17 +96,16 @@ inherited frmDyePCList: TfrmDyePCList
   object Panel1: TPanel [1]
     Left = 0
     Top = 38
-    Width = 1145
+    Width = 1180
     Height = 64
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
-    Visible = False
     object Label3: TLabel
-      Left = 21
+      Left = 293
-      Top = 20
+      Top = 28
       Width = 48
       Height = 13
       Caption = #27969#31243#21345#21495
@@ -131,10 +131,24 @@ inherited frmDyePCList: TfrmDyePCList
       Height = 13
       Caption = #33457#22411#21495
     end
+    object Label1: TLabel
+      Left = 23
+      Top = 6
+      Width = 48
+      Height = 13
+      Caption = #24320#22987#26102#38388
+    end
+    object Label2: TLabel
+      Left = 23
+      Top = 40
+      Width = 48
+      Height = 13
+      Caption = #32467#26463#26102#38388
+    end
     object pcid: TEdit
       Tag = 2
-      Left = 71
+      Left = 347
-      Top = 16
+      Top = 24
       Width = 154
       Height = 21
       TabOrder = 0
@@ -167,6 +181,44 @@ inherited frmDyePCList: TfrmDyePCList
       TabOrder = 3
       OnChange = pcidChange
     end
+    object BegDate: TDateTimePicker
+      Left = 88
+      Top = 6
+      Width = 89
+      Height = 21
+      Date = 45922.000000000000000000
+      Time = 0.672359988428070200
+      TabOrder = 4
+    end
+    object EndDate: TDateTimePicker
+      Left = 88
+      Top = 33
+      Width = 89
+      Height = 21
+      Date = 45912.000000000000000000
+      Time = 0.672466979165619700
+      TabOrder = 5
+    end
+    object BegTime: TDateTimePicker
+      Left = 176
+      Top = 6
+      Width = 73
+      Height = 21
+      Date = 45912.000000000000000000
+      Time = 0.672359988428070200
+      Kind = dtkTime
+      TabOrder = 6
+    end
+    object EndTime: TDateTimePicker
+      Left = 176
+      Top = 33
+      Width = 73
+      Height = 21
+      Date = 45912.000000000000000000
+      Time = 0.672466979165619700
+      Kind = dtkTime
+      TabOrder = 7
+    end
   end
   object MovePanel2: TMovePanel [2]
     Left = 351
@@ -188,13 +240,12 @@ inherited frmDyePCList: TfrmDyePCList
   object dbGrid1: TcxGrid [3]
     Left = 0
     Top = 102
-    Width = 1145
+    Width = 1180
-    Height = 485
+    Height = 482
-    Align = alTop
+    Align = alClient
     TabOrder = 3
     LookAndFeel.ScrollbarMode = sbmHybrid
     LookAndFeel.ScrollMode = scmDefault
-    ExplicitTop = 108
     object tv1: TcxGridDBTableView
       Tag = 9999
       DragMode = dmAutomatic
@@ -202,6 +253,7 @@ inherited frmDyePCList: TfrmDyePCList
       FindPanel.DisplayMode = fpdmAlways
       FindPanel.UseExtendedSyntax = True
       ScrollbarAnnotations.CustomAnnotations = <>
+      OnCellDblClick = tv1CellDblClick
       DataController.DataSource = DataSource1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -210,166 +262,148 @@ inherited frmDyePCList: TfrmDyePCList
       DataController.Summary.SummaryGroups = <>
       DateTimeHandling.Grouping = dtgByDate
       OptionsData.Deleting = False
-      OptionsData.Editing = False
       OptionsData.Inserting = False
+      OptionsView.CellAutoHeight = True
+      OptionsView.ColumnAutoWidth = True
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       OptionsView.Indicator = True
+      OptionsView.IndicatorWidth = 30
+      Styles.Selection = DataLink_DyeProcess.SHuangSe
       object tv1CraftIdx: TcxGridDBColumn
         DataBinding.FieldName = 'CraftIdx'
         DataBinding.IsNullValueType = True
         Visible = False
       end
       object tv1mcName: TcxGridDBColumn
-        Caption = #26426#32568
+        Caption = #26102#38388
-        DataBinding.FieldName = 'machNo'
+        DataBinding.FieldName = 'time'
         DataBinding.IsNullValueType = True
-        FixedKind = fkLeftDynamic
+        PropertiesClassName = 'TcxDateEditProperties'
+        Properties.DisplayFormat = 'yyyy-mm-dd hh:nn:ss'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
-        Width = 99
+        Width = 88
       end
-      object tv1runStatus: TcxGridDBColumn
+      object tv1CCQX1: TcxGridDBColumn
         Tag = 99
-        Caption = #29366#24577
+        Caption = #38271#36710#28165#27927#26426
-        DataBinding.FieldName = 'runStatus'
+        DataBinding.FieldName = 'CCQX1'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 64
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1CCQX1StylesGetContentStyle
+        Width = 109
+        OnCompareRowValuesForCellMerging = tv1CCQX1CompareRowValuesForCellMerging
       end
-      object tv1lastMinNum: TcxGridDBColumn
+      object tv1DX1: TcxGridDBColumn
-        Caption = #19982#19978#32568#38388#38548'('#20998')'
+        Caption = #23450#22411#26426#19968#21495#26426
-        DataBinding.FieldName = 'lastMinNum'
+        DataBinding.FieldName = 'DX1'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.CellMerging = True
-        Options.Focusing = False
+        Styles.OnGetContentStyle = tv1DX1StylesGetContentStyle
         Width = 125
+        OnCompareRowValuesForCellMerging = tv1DX1CompareRowValuesForCellMerging
       end
-      object tv1curDoInfo: TcxGridDBColumn
+      object tv1DX2: TcxGridDBColumn
-        Caption = #24403#21069#29983#20135
+        Caption = #23450#22411#26426#20108#21495#26426
-        DataBinding.FieldName = 'curDoInfo'
+        DataBinding.FieldName = 'DX2'
         DataBinding.IsNullValueType = True
-        FixedKind = fkLeftDynamic
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
-        Options.Focusing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX2StylesGetContentStyle
         Width = 114
+        OnCompareRowValuesForCellMerging = tv1DX2CompareRowValuesForCellMerging
       end
-      object tv1curInTime: TcxGridDBColumn
+      object tv1DX3: TcxGridDBColumn
-        Caption = #26412#32568#36827#32568#26102#38388
+        Caption = #23450#22411#26426#19977#21495#26426
-        DataBinding.FieldName = 'curInTime'
+        DataBinding.FieldName = 'DX3'
         DataBinding.IsNullValueType = True
-        FixedKind = fkLeftDynamic
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
-        Options.Focusing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX3StylesGetContentStyle
         Width = 117
+        OnCompareRowValuesForCellMerging = tv1DX3CompareRowValuesForCellMerging
       end
-      object tv1runTime: TcxGridDBColumn
+      object tv1DX4: TcxGridDBColumn
-        Caption = #24050#25345#32493'(h)'
+        Caption = #23450#22411#26426#22235#21495#26426
-        DataBinding.FieldName = 'runTime'
+        DataBinding.FieldName = 'DX4'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
-        Options.Filtering = False
+        Options.CellMerging = True
-        Options.Focusing = False
+        Styles.OnGetContentStyle = tv1DX4StylesGetContentStyle
-        Width = 80
+        Width = 109
+        OnCompareRowValuesForCellMerging = tv1DX4CompareRowValuesForCellMerging
       end
-      object tv1Column1: TcxGridDBColumn
+      object tv1DX5: TcxGridDBColumn
-        Caption = #39044#35745#20986#32568
+        Caption = #23450#22411#26426#20116#21495#26426
-        DataBinding.IsNullValueType = True
+        DataBinding.FieldName = 'DX5'
-        Options.Editing = False
-        Options.Focusing = False
-        Width = 85
-      end
-      object tv1wait1: TcxGridDBColumn
-        Caption = #31561#24453'1'
-        DataBinding.FieldName = 'wait1'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
-        Options.Focusing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX5StylesGetContentStyle
+        Width = 103
+        OnCompareRowValuesForCellMerging = tv1DX5CompareRowValuesForCellMerging
+      end
+      object tv1DX6: TcxGridDBColumn
+        Caption = #23450#22411#26426#20845#21495#26426
+        DataBinding.FieldName = 'DX6'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.FilteringPopupIncrementalFiltering = True
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX6StylesGetContentStyle
         Width = 100
+        OnCompareRowValuesForCellMerging = tv1DX6CompareRowValuesForCellMerging
       end
-      object tv1wait2: TcxGridDBColumn
+      object tv1JG1: TcxGridDBColumn
-        Caption = #31561#24453'2'
+        Caption = #26426#32568
-        DataBinding.FieldName = 'wait2'
+        DataBinding.FieldName = 'JG1'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
-        Options.Focusing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1JG1StylesGetContentStyle
         Width = 100
+        OnCompareRowValuesForCellMerging = tv1JG1CompareRowValuesForCellMerging
       end
-      object tv1wait3: TcxGridDBColumn
+      object tv1JRG1: TcxGridDBColumn
-        Caption = #31561#24453'3'
+        Caption = #21367#26579#32568'1'
-        DataBinding.FieldName = 'wait3'
+        DataBinding.FieldName = 'JRG1'
         DataBinding.IsNullValueType = True
-        FixedKind = fkLeftDynamic
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
-        Options.Focusing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1JRG1StylesGetContentStyle
         Width = 100
+        OnCompareRowValuesForCellMerging = tv1JRG1CompareRowValuesForCellMerging
       end
-      object tv1wait4: TcxGridDBColumn
+      object tv1JRG2: TcxGridDBColumn
-        Caption = #31561#24453'4'
+        Caption = #21367#26579#32568'2'
-        DataBinding.FieldName = 'wait4'
+        DataBinding.FieldName = 'JRG2'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
-        Options.Focusing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1JRG2StylesGetContentStyle
         Width = 100
+        OnCompareRowValuesForCellMerging = tv1JRG2CompareRowValuesForCellMerging
       end
-      object tv1wait5: TcxGridDBColumn
+      object tv1JRG3: TcxGridDBColumn
-        Caption = #31561#24453'5'
+        Caption = #21367#26579#32568'3'
-        DataBinding.FieldName = 'wait5'
+        DataBinding.FieldName = 'JRG3'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Options.CellMerging = True
-        Options.Filtering = False
+        Styles.OnGetContentStyle = tv1JRG3StylesGetContentStyle
-        Options.Focusing = False
         Width = 100
-      end
+        OnCompareRowValuesForCellMerging = tv1JRG3CompareRowValuesForCellMerging
-      object tv1wait6: TcxGridDBColumn
-        Caption = #31561#24453'6'
-        DataBinding.FieldName = 'wait6'
-        DataBinding.IsNullValueType = True
-        FixedKind = fkLeftDynamic
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Focusing = False
-        Width = 100
-      end
-      object tv1finish1: TcxGridDBColumn
-        Caption = #23436'1'
-        DataBinding.FieldName = 'finish1'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Filtering = False
-        Options.Focusing = False
-        Width = 63
-      end
-      object tv1finish2: TcxGridDBColumn
-        Caption = #23436'2'
-        DataBinding.FieldName = 'finish2'
-        DataBinding.IsNullValueType = True
-        FixedKind = fkLeftDynamic
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Filtering = False
-        Options.Focusing = False
-        Width = 61
-      end
-      object tv1finish3: TcxGridDBColumn
-        Caption = #23436'3'
-        DataBinding.FieldName = 'finish3'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Filtering = False
-        Width = 70
       end
       object tv1GC_BatchNo: TcxGridDBColumn
         Caption = #22383#24067#25209#27425
@@ -380,32 +414,6 @@ inherited frmDyePCList: TfrmDyePCList
         Options.Filtering = False
         Width = 89
       end
-      object tv1finish4: TcxGridDBColumn
-        Caption = #23436'4'
-        DataBinding.FieldName = 'finish4'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 92
-      end
-      object tv1finish5: TcxGridDBColumn
-        Caption = #23436'5'
-        DataBinding.FieldName = 'finish5'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 103
-      end
-      object tv1finish6: TcxGridDBColumn
-        Caption = #23436'6'
-        DataBinding.FieldName = 'finish6'
-        DataBinding.IsNullValueType = True
-        FixedKind = fkLeftDynamic
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Focusing = False
-        Width = 61
-      end
       object tv1CurGlideName: TcxGridDBColumn
         Caption = #21047#21345#36827#24230
         DataBinding.FieldName = 'CurGlideName'
@@ -427,6 +435,13 @@ inherited frmDyePCList: TfrmDyePCList
         Options.Focusing = False
         Width = 109
       end
+      object tv1PCKey: TcxGridDBColumn
+        DataBinding.FieldName = 'PCKey'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
     end
     object dbGrid1Level1: TcxGridLevel
       GridView = tv1
@@ -468,9 +483,10 @@ inherited frmDyePCList: TfrmDyePCList
     Top = 360
   end
   object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = dbGrid1
     PopupMenus = <>
-    Left = 888
+    Left = 920
-    Top = 144
+    Top = 216
   end
   object CDS_Main: TClientDataSet
     Aggregates = <>

F04染色刷卡/U_DyePCList.pas

@@ -44,29 +44,29 @@ type
     tv1: TcxGridDBTableView;
     tv1CraftIdx: TcxGridDBColumn;
     tv1mcName: TcxGridDBColumn;
-    tv1runStatus: TcxGridDBColumn;
+    tv1CCQX1: TcxGridDBColumn;
-    tv1lastMinNum: TcxGridDBColumn;
+    tv1DX1: TcxGridDBColumn;
-    tv1curDoInfo: TcxGridDBColumn;
+    tv1DX2: TcxGridDBColumn;
-    tv1curInTime: TcxGridDBColumn;
+    tv1DX3: TcxGridDBColumn;
-    tv1runTime: TcxGridDBColumn;
+    tv1DX4: TcxGridDBColumn;
-    tv1Column1: TcxGridDBColumn;
+    tv1DX5: TcxGridDBColumn;
-    tv1wait1: TcxGridDBColumn;
+    tv1DX6: TcxGridDBColumn;
-    tv1wait2: TcxGridDBColumn;
+    tv1JG1: TcxGridDBColumn;
-    tv1wait3: TcxGridDBColumn;
+    tv1JRG1: TcxGridDBColumn;
-    tv1wait4: TcxGridDBColumn;
+    tv1JRG2: TcxGridDBColumn;
-    tv1wait5: TcxGridDBColumn;
+    tv1JRG3: TcxGridDBColumn;
-    tv1wait6: TcxGridDBColumn;
-    tv1finish1: TcxGridDBColumn;
-    tv1finish2: TcxGridDBColumn;
-    tv1finish3: TcxGridDBColumn;
     tv1GC_BatchNo: TcxGridDBColumn;
-    tv1finish4: TcxGridDBColumn;
-    tv1finish5: TcxGridDBColumn;
-    tv1finish6: TcxGridDBColumn;
     tv1CurGlideName: TcxGridDBColumn;
     tv1Note: TcxGridDBColumn;
     dbGrid1Level1: TcxGridLevel;
     ToolButton2: TToolButton;
+    BegDate: TDateTimePicker;
+    EndDate: TDateTimePicker;
+    Label1: TLabel;
+    Label2: TLabel;
+    tv1PCKey: TcxGridDBColumn;
+    BegTime: TDateTimePicker;
+    EndTime: TDateTimePicker;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -81,6 +81,49 @@ type
     procedure TBdelClick(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
+    procedure tv1JRG1CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1JRG2CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+    procedure tv1CCQX1CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1DX1CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1DX2CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1DX3CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1DX4CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1DX5CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1DX6CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1JG1CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1JRG3CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+    procedure tv1DX1StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+    procedure tv1CCQX1StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1DX2StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1DX3StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1DX4StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1DX5StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1DX6StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1JG1StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1JRG1StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1JRG2StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1JRG3StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
 
   private
     FLeft, FTop: Integer;
@@ -88,6 +131,7 @@ type
     { Private declarations }
   public
     fsyrName, canshu1: string;
+
     { Public declarations }
   end;
 
@@ -122,6 +166,7 @@ begin
   fsyrName := trim(DdataBase);
   canshu1 := trim(DParameters1);
 //  SInitComBoxBySql(ADOQueryTemp, GlideName, false, 'select PSName as Name from Dye_Process');
+
 end;
 
 procedure TfrmDyePCList.InitGrid();
@@ -136,17 +181,18 @@ begin
   try
     tv1.BeginUpdate;
     ADOQueryMain.DisableControls;
+
     with ADOQueryMain do
     begin
       close;
       filtered := false;
       sql.Clear;
-      sql.Add('exec p_dyemach_pcjklist');
+      SQL.Add('select * from PCAboutTime where time between :StartTime and :EndTime order By Time');
-//      sql.Add('@PCID=' + quotedStr(PCID.text));
+      Parameters.ParamByName('StartTime').Value := Trunc(BegDate.Date) + Frac(BegTime.Time);
-//      sql.Add(',@cust=' + quotedStr(trim(custName.Text)));
+      Parameters.ParamByName('EndTime').Value := Trunc(EndDate.Date) + Frac(EndTime.Time);
-//      sql.Add(',@cpName=' + quotedStr(''));
+
-//      sql.Add(',@color=' + quotedStr(trim(C_color.Text)));
       Open;
+
     end;
     SCreateCDS(ADOQueryMain, CDS_main);
     SInitCDSData(ADOQueryMain, CDS_main);
@@ -167,7 +213,7 @@ end;
 
 procedure TfrmDyePCList.ToolButton1Click(Sender: TObject);
 begin
-  WriteCxGrid(self.Caption + tv1.Name, Tv1, '³ÉÆ·²Ö¿â');
+  WriteCxGrid(self.Caption + tv1.Name, Tv1, '排产信息');
 end;
 
 procedure TfrmDyePCList.ToolButton2Click(Sender: TObject);
@@ -178,14 +224,450 @@ begin
   frmMachTaskList := TfrmMachTaskList.create(self);
   with frmMachTaskList do
   begin
-    fcurMachId := trim(self.adoquerymain.FieldByName('mcid').AsString);
+//    fcurMachId := trim(self.adoquerymain.FieldByName('mcid').AsString);
-    machName.text := trim(self.adoquerymain.FieldByName('mcName').AsString);
+//    machName.text := trim(self.adoquerymain.FieldByName('mcName').AsString);
     showModal;
     free;
   end;
   initgrid();
 end;
 
+procedure TfrmDyePCList.tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+begin
+//  if ADOQuerymain.IsEmpty then
+//    exit;
+
+  frmMachTaskList := TfrmMachTaskList.create(self);
+  with frmMachTaskList do
+  begin
+    fBegTime := Self.CDS_Main.FieldByName('time').AsString;
+    fMCName := Self.Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName;
+    fText := self.CDS_Main.FieldByName(fMCName).AsString;
+    showModal;
+    free;
+  end;
+  initgrid();
+end;
+
+procedure TfrmDyePCList.tv1DX5CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1DX5.Index] = ARow2.Values[tv1DX5.Index]) and (ARow1.Values[tv1DX5.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1DX5StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1DX5.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1DX2CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1DX2.Index] = ARow2.Values[tv1DX2.Index]) and (ARow1.Values[tv1DX2.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1DX2StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1DX2.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1DX3CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1DX3.Index] = ARow2.Values[tv1DX3.Index]) and (ARow1.Values[tv1DX3.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1DX3StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1DX3.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1DX1CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1DX1.Index] = ARow2.Values[tv1DX1.Index]) and (ARow1.Values[tv1DX1.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1DX1StylesGetContentStyle(Sender: TcxCustomGridTableView;
+  ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1DX1.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+//procedure TfrmDyePCList.tv1DX1StylesGetContentStyle(
+//  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+//  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+//begin
+//  if ARecord <> nil then
+//  begin
+//    if ARecord.RecordIndex mod 2 = 0 then
+//    begin
+//      // 偶数行：白色背景
+//      AStyle := TcxStyle.Create(nil);
+//      AStyle.Color := clWhite;
+//      AStyle.TextColor := clBlack;
+//    end
+//    else
+//    begin
+//      // 奇数行：浅灰色背景
+//      AStyle := TcxStyle.Create(nil);
+//      AStyle.Color := $00FFF5E1;  // 浅灰色
+//      AStyle.TextColor := clBlack;
+//    end;
+//  end;
+//end;
+
+procedure TfrmDyePCList.tv1CCQX1CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1CCQX1.Index] = ARow2.Values[tv1CCQX1.Index]) and (ARow1.Values[tv1CCQX1.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1CCQX1StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1CCQX1.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1DX4CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1DX4.Index] = ARow2.Values[tv1DX4.Index]) and (ARow1.Values[tv1DX4.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1DX4StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1DX4.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1DX6CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1DX6.Index] = ARow2.Values[tv1DX6.Index]) and (ARow1.Values[tv1DX6.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1DX6StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1DX6.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1JG1CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1JG1.Index] = ARow2.Values[tv1JG1.Index]) and (ARow1.Values[tv1JG1.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1JG1StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1JG1.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1JRG1CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1JRG1.Index] = ARow2.Values[tv1JRG1.Index]) and (ARow1.Values[tv1JRG1.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+
+end;
+
+procedure TfrmDyePCList.tv1JRG1StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1JRG1.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1JRG2CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1JRG2.Index] = ARow2.Values[tv1JRG2.Index]) and (ARow1.Values[tv1JRG2.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1JRG2StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1JRG2.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1JRG3CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1JRG3.Index] = ARow2.Values[tv1JRG3.Index]) and (ARow1.Values[tv1JRG3.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1JRG3StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1JRG3.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0: AStyle.Color := $00CCFFFF;  // 淡黄色
+        1: AStyle.Color := $00CCFFCC;  // 淡绿色
+        2: AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
 procedure TfrmDyePCList.ConNoMChange(Sender: TObject);
 begin
   if ADOQueryMain.Active then
@@ -203,9 +685,16 @@ end;
 procedure TfrmDyePCList.FormShow(Sender: TObject);
 begin
   inherited;
-  ReadCxGrid(self.Caption + tv1.Name, Tv1, '³ÉÆ·²Ö¿â');
+  ReadCxGrid(self.Caption + tv1.Name, Tv1, '排产信息');
   canshu1 := self.fParameters1;
+//  BegDate.DateTime := strToDateTime(FormatDateTime('yyyy-MM-dd 00:00:00', SGetServerDate(ADOQueryTemp))) - 1;
+//  EndDate.DateTime := strToDateTime(FormatDateTime('yyyy-MM-dd 00:00:00', SGetServerDate(ADOQueryTemp))) + 1;
+  var ServerDate: TDateTime := SGetServerDate(ADOQueryTemp);
 
+  BegDate.Date := Trunc(ServerDate) - 1;  // 前一天
+  EndDate.Date := Trunc(ServerDate) + 1;  // 后一天
+  BegTime.Time := EncodeTime(0, 0, 0, 0);   // 早上8点
+  endTime.Time := EncodeTime(0, 0, 0, 0);  // 晚上6点
   initgrid();
 end;
 

F04染色刷卡/U_MachTaskList.dfm

@@ -2,8 +2,8 @@ object frmMachTaskList: TfrmMachTaskList
   Left = 0
   Top = 0
   Caption = #25195#25551#25490#32568
-  ClientHeight = 824
+  ClientHeight = 836
-  ClientWidth = 1271
+  ClientWidth = 1540
   Color = clBtnFace
   Font.Charset = ANSI_CHARSET
   Font.Color = clWindowText
@@ -16,145 +16,183 @@ object frmMachTaskList: TfrmMachTaskList
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 21
+  object Splitter1: TSplitter
+    Left = 846
+    Top = 97
+    Height = 739
+    Align = alRight
+    ExplicitLeft = 688
+    ExplicitTop = 296
+    ExplicitHeight = 100
+  end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 121
+    Top = 97
-    Width = 1271
+    Width = 846
-    Height = 703
+    Height = 739
     Align = alClient
     Images = DataLink_DyeProcess.ThreeImgList
     TabOrder = 0
-    ExplicitTop = 127
+    ExplicitLeft = 8
-    object tv1: TcxGridDBTableView
+    ExplicitTop = 91
+    object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
-      DataController.DataSource = DataSource1
+      DataController.DataSource = DS_1
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
         item
           Kind = skSum
-          Column = tv1taskQty
+          Column = Tv1taskQty
         end
         item
           Kind = skSum
-          Column = tv1taskRollNum
+          Column = Tv1taskRollNum
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
       OptionsCustomize.ColumnGrouping = False
       OptionsCustomize.ColumnSorting = False
       OptionsData.Deleting = False
-      OptionsData.Editing = False
       OptionsData.Inserting = False
       OptionsView.ShowEditButtons = gsebForFocusedRecord
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       OptionsView.HeaderHeight = 30
-      Styles.UseOddEvenStyles = bFalse
+      object Tv1OrderNo: TcxGridDBColumn
-      object tv1OrderNo: TcxGridDBColumn
         Caption = #35745#21010#21333
         DataBinding.FieldName = 'OrderNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 74
+        Options.Editing = False
+        Width = 59
       end
-      object tv1custName: TcxGridDBColumn
+      object Tv1pcid: TcxGridDBColumn
-        Caption = #23458#25143
+        Caption = #27969#31243#21345#21495
-        DataBinding.FieldName = 'custName'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 70
-      end
-      object tv1pcid: TcxGridDBColumn
-        Caption = #27969#31243#21345
         DataBinding.FieldName = 'pcid'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 115
+        Options.Editing = False
+        Width = 92
       end
-      object tv1C_name: TcxGridDBColumn
+      object Tv1C_name: TcxGridDBColumn
-        Caption = #20135#21697#21517#31216
+        Caption = #25104#21697#21517#31216
         DataBinding.FieldName = 'C_name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 125
+        Options.Editing = False
+        Width = 99
       end
-      object tv1c_color: TcxGridDBColumn
+      object Tv1c_color: TcxGridDBColumn
-        Caption = #39068#33394
+        Caption = #24037#24207#21517#31216
-        DataBinding.FieldName = 'c_color'
+        DataBinding.FieldName = 'GlideName'
         DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Properties.OnButtonClick = Tv1c_colorPropertiesButtonClick
         HeaderAlignmentHorz = taCenter
-        Width = 98
+        Width = 78
       end
-      object tv1taskDate: TcxGridDBColumn
+      object Tv1taskRollNum: TcxGridDBColumn
-        Caption = #20219#21153#26102#38388
+        Caption = #20219#21153#21305#25968
-        DataBinding.FieldName = 'taskDate'
+        DataBinding.FieldName = 'PCPiece'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 103
+        Width = 87
       end
-      object tv1taskRollNum: TcxGridDBColumn
+      object Tv1taskQty: TcxGridDBColumn
-        Caption = #21305#25968
-        DataBinding.FieldName = 'taskRollNum'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Filtering = False
-        Width = 71
-      end
-      object tv1taskQty: TcxGridDBColumn
         Caption = #20219#21153#25968#37327
-        DataBinding.FieldName = 'taskQty'
+        DataBinding.FieldName = 'PCQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 82
+      end
+      object Tv1taskDate: TcxGridDBColumn
+        Caption = #20219#21153#26102#38388
+        DataBinding.FieldName = 'time'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 79
+      end
+      object Tv1MCNO: TcxGridDBColumn
+        Caption = #26426#21488
+        DataBinding.FieldName = 'MCNO'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.OnButtonClick = tv1CarNoPropertiesButtonClick
+        HeaderAlignmentHorz = taCenter
+        Width = 61
+      end
+      object Tv1BegTime: TcxGridDBColumn
+        Caption = #24320#22987#26102#38388
+        DataBinding.FieldName = 'BegTime'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxDateEditProperties'
+        Properties.Kind = ckDateTime
+        Properties.OnValidate = tv1BegTimePropertiesValidate
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object Tv1MCName: TcxGridDBColumn
+        Caption = #26426#21488#21517#31216
+        DataBinding.FieldName = 'MCName'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 86
       end
-      object tv1CarNo: TcxGridDBColumn
+      object Tv1GlideID: TcxGridDBColumn
-        Caption = #36733#36710#21495
+        Caption = #20027#38190
-        DataBinding.FieldName = 'CarNo'
+        DataBinding.FieldName = 'GlideID'
         DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
+        Visible = False
-        Width = 81
+        Width = 80
       end
-      object tv1Column1: TcxGridDBColumn
+      object Tv1GlideNo: TcxGridDBColumn
-        Caption = #38376#24133
+        Caption = #24207#21495
-        DataBinding.FieldName = 'C_Width'
+        DataBinding.FieldName = 'GlideNo'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
-      object tv1Column2: TcxGridDBColumn
+      object Tv1PSType: TcxGridDBColumn
-        Caption = #20811#37325
+        Caption = #31867#22411
-        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.FieldName = 'PSType'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Width = 90
+      end
+      object Tv1PSID: TcxGridDBColumn
+        Caption = #24037#24207#20027#38190
+        DataBinding.FieldName = 'PSID'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
         Width = 80
       end
-      object tv1Column3: TcxGridDBColumn
-        Caption = #33394#21495
-        DataBinding.FieldName = 'C_ColorNo'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 80
-      end
-      object tv1Column4: TcxGridDBColumn
-        Caption = #22791#27880
-        DataBinding.FieldName = 'PJNote'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 139
-      end
     end
     object cxGrid1Level1: TcxGridLevel
-      GridView = tv1
+      GridView = Tv1
     end
   end
   object ToolBar3: TToolBar
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1271
+    Width = 1540
     Height = 38
     AutoSize = True
     ButtonHeight = 38
@@ -180,6 +218,7 @@ object frmMachTaskList: TfrmMachTaskList
       AutoSize = True
       Caption = #19978#31227
       ImageIndex = 19
+      Visible = False
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
@@ -188,26 +227,43 @@ object frmMachTaskList: TfrmMachTaskList
       AutoSize = True
       Caption = #19979#31227
       ImageIndex = 17
+      Visible = False
       OnClick = ToolButton2Click
     end
-    object Tconfirm: TToolButton
+    object TbSave: TToolButton
       Left = 237
       Top = 0
       AutoSize = True
-      Caption = #20445#23384#26684#24335
+      Caption = #20445#23384
-      ImageIndex = 15
+      ImageIndex = 16
-      OnClick = TconfirmClick
+      OnClick = TbSaveClick
     end
-    object TBDel: TToolButton
+    object TbEditSave: TToolButton
-      Left = 348
+      Left = 316
       Top = 0
       AutoSize = True
-      Caption = #21024#38500#25490#32568
+      Caption = #20462#25913#20445#23384
+      ImageIndex = 3
+      OnClick = TbEditSaveClick
+    end
+    object TBDel: TToolButton
+      Left = 427
+      Top = 0
+      AutoSize = True
+      Caption = #21024#38500#20445#23384
       ImageIndex = 5
       OnClick = TBDelClick
     end
+    object Tconfirm: TToolButton
+      Left = 538
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = TconfirmClick
+    end
     object Tclose: TToolButton
-      Left = 459
+      Left = 649
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -218,13 +274,12 @@ object frmMachTaskList: TfrmMachTaskList
   object Panel1: TPanel
     Left = 0
     Top = 38
-    Width = 1271
+    Width = 1540
-    Height = 83
+    Height = 59
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 2
-    ExplicitTop = 27
     object Label1: TLabel
       Left = 24
       Top = 18
@@ -239,11 +294,11 @@ object frmMachTaskList: TfrmMachTaskList
       ParentFont = False
     end
     object Label2: TLabel
-      Left = 368
+      Left = 357
-      Top = 18
+      Top = 15
-      Width = 32
+      Width = 64
       Height = 22
-      Caption = #26426#21488
+      Caption = #20135#21697#21517#31216
       Font.Charset = ANSI_CHARSET
       Font.Color = clWindowText
       Font.Height = -16
@@ -252,8 +307,8 @@ object frmMachTaskList: TfrmMachTaskList
       ParentFont = False
     end
     object pcid: TcxTextEdit
-      Left = 104
+      Left = 99
-      Top = 9
+      Top = 11
       ParentFont = False
       Style.Font.Charset = DEFAULT_CHARSET
       Style.Font.Color = clWindowText
@@ -265,9 +320,9 @@ object frmMachTaskList: TfrmMachTaskList
       OnKeyPress = pcidKeyPress
       Width = 228
     end
-    object machName: TcxTextEdit
+    object C_Name: TcxTextEdit
-      Left = 422
+      Left = 427
-      Top = 9
+      Top = 11
       ParentFont = False
       Properties.ReadOnly = True
       Style.Font.Charset = DEFAULT_CHARSET
@@ -280,10 +335,113 @@ object frmMachTaskList: TfrmMachTaskList
       Width = 155
     end
   end
-  object DataSource1: TDataSource
+  object cxGrid2: TcxGrid
-    DataSet = ADOQueryList
+    Left = 849
-    Left = 184
+    Top = 97
-    Top = 208
+    Width = 691
+    Height = 739
+    Align = alRight
+    TabOrder = 3
+    ExplicitLeft = 852
+    ExplicitTop = 103
+    object Tv2: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      FindPanel.DisplayMode = fpdmAlways
+      ScrollbarAnnotations.CustomAnnotations = <>
+      OnCellDblClick = Tv2CellDblClick
+      DataController.DataSource = DS_2
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <>
+      DataController.Summary.SummaryGroups = <>
+      OptionsView.GroupByBox = False
+      object Tv2OrderNo: TcxGridDBColumn
+        Caption = #35745#21010#21333#21495
+        DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 99
+      end
+      object Tv2PCID: TcxGridDBColumn
+        Caption = #27969#31243#21345#21495
+        DataBinding.FieldName = 'PCID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 89
+      end
+      object Tv2GlideName: TcxGridDBColumn
+        Caption = #24037#24207#21517#31216
+        DataBinding.FieldName = 'GlideName'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Properties.OnButtonClick = Tv2GlideNamePropertiesButtonClick
+        HeaderAlignmentHorz = taCenter
+        Width = 92
+      end
+      object Tv2GlideNo: TcxGridDBColumn
+        Caption = #24207#21495
+        DataBinding.FieldName = 'GlideNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object Tv2C_Name: TcxGridDBColumn
+        Caption = #20135#21697#21517#31216
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 97
+      end
+      object Tv2PSType: TcxGridDBColumn
+        Caption = #31867#22411
+        DataBinding.FieldName = 'PSType'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 70
+      end
+      object Tv2All_zhuji: TcxGridDBColumn
+        Caption = #21161#21058
+        DataBinding.FieldName = 'All_zhuji'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object Tv2ALL_temperature6: TcxGridDBColumn
+        Caption = '6#'#28201#24230
+        DataBinding.FieldName = 'ALL_temperature6'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 90
+      end
+      object Tv2GlideID: TcxGridDBColumn
+        Caption = #25490#20135'ID'
+        DataBinding.FieldName = 'GlideID'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+    end
+    object cxGrid2Level1: TcxGridLevel
+      GridView = Tv2
+    end
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 728
+    Top = 224
   end
   object ADOQueryList: TADOQuery
     Connection = DataLink_DyeProcess.ADOLink
@@ -319,4 +477,33 @@ object frmMachTaskList: TfrmMachTaskList
     Left = 320
     Top = 360
   end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 840
+    Top = 232
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 1168
+    Top = 288
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 1280
+    Top = 296
+  end
+  object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 680
+    Top = 312
+  end
+  object cxGridPopupMenu2: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 1056
+    Top = 224
+  end
 end

F05染色检验/DyeInsp.dproj.local

@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.664,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F05染色检验/DyeInspLogin.dproj.local

@@ -21,6 +21,6 @@
     <File Path="JDAESExtend.pas"/>
   </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj</Transaction>
   </Transactions>
 </BorlandProject>

F05染色检验/U_DyeClothInspList.dfm

@@ -20,7 +20,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList
     AutoSize = True
     BorderStyle = bsSingle
     TabOrder = 3
-    ExplicitWidth = 1472
     DesignSize = (
       1467
       24)
@@ -128,7 +127,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList
     ParentFont = False
     PopupMenu = PM_1
     TabOrder = 2
-    ExplicitTop = 136
     object Tv1: TcxGridDBTableView
       OnMouseUp = Tv1MouseUp
       Navigator.Buttons.CustomButtons = <>
@@ -505,7 +503,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList
     ParentFont = False
     ShowCaptions = True
     TabOrder = 0
-    ExplicitWidth = 1472
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -599,7 +596,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList
     Color = 16242829
     ParentBackground = False
     TabOrder = 4
-    ExplicitWidth = 1472
     object Label3: TLabel
       Left = 195
       Top = 14

F05染色检验/U_DyeClothInspList.pas

@@ -401,7 +401,7 @@ end;
 
 procedure TfrmDyeClothInspList.btnJBQClick(Sender: TObject);
 var
-  fPrintFile, FLBName: string;
+  MCIID: string;
 begin
   if Order_Main.IsEmpty then
     Exit;
@@ -410,14 +410,34 @@ begin
     Application.MessageBox('ûÓÐÑ¡ÔñÊý¾Ý!', 'Ìáʾ', 0);
     Exit;
   end;
+
+  MCIID := '';
   Order_Main.DisableControls;
   with Order_Main do
   begin
+    MCIID :=  Trim(Order_Main.fieldbyname('CIID').AsString);
     First;
-    while not Eof do
+    while Order_Main.Locate('SSel', True, []) do
     begin
-      if Order_Main.FieldByName('SSel').AsBoolean = True then
+
+//      MPCID := MPCID + ',' + Trim(CDS_1.fieldbyname('PCID').AsString);
+
+      Edit;
+      FieldByName('SSel').Value := False;
+      Post;
+    end;
+  end;
+  Order_Main.EnableControls;
+
+  try
+    frmLabelPrint := TfrmLabelPrint.Create(Application);
+    with frmLabelPrint do
+    begin
+      FLMType := 'DyeClothInspListPrint1';
+      FFiltration1 := MCIID;
+      if ShowModal = 1 then
       begin
+//        Self.InitGrid();
         with ADOQueryCmd do
         begin
           Close;
@@ -426,43 +446,77 @@ begin
           sql.Add(' where CIID=''' + Trim(Order_Main.fieldbyname('CIID').AsString) + '''');
           ExecSQL;
         end;
-
-        with ADOQueryPrint do
-        begin
-          Close;
-          SQL.Clear;
-          sql.Add(' EXEC P_Dye_Insp_Prt_Lab ');
-          SQL.Add(' @CIID=''' + Trim(Order_Main.fieldbyname('CIID').AsString) + '''');
-          Open;
-        end;
-        if ADOQueryPrint.IsEmpty then
-        begin
-          application.MessageBox('标签内容未找到！', '提示信息', MB_ICONERROR);
-          exit;
-        end;
-
-        FLBName := Trim(ADOQueryPrint.fieldbyname('LBName').AsString);
-        ExportFtErpFile(FLBName + '.rmf', ADOQueryTemp);
-
-        fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + FLBName + '.rmf';
-
-        if FileExists(fPrintFile) then
-        begin
-          RM1.LoadFromFile(fPrintFile);
-          Rm1.DefaultCopies := 2;
-          RM1.PrintReport;
-        end
-        else
-        begin
-          Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
-        end;
       end;
-      Next;
     end;
+  finally
+    frmLabelPrint.Free;
   end;
-  Order_Main.EnableControls;
 end;
 
+
+//var
+//  fPrintFile, FLBName: string;
+//begin
+//  if Order_Main.IsEmpty then
+//    Exit;
+//  if Order_Main.Locate('SSel', True, []) = False then
+//  begin
+//    Application.MessageBox('没有选择数据!', '提示', 0);
+//    Exit;
+//  end;
+//  Order_Main.DisableControls;
+//  with Order_Main do
+//  begin
+//    First;
+//    while not Eof do
+//    begin
+//      if Order_Main.FieldByName('SSel').AsBoolean = True then
+//      begin
+//        with ADOQueryCmd do
+//        begin
+//          Close;
+//          sql.Clear;
+//          sql.Add('Update Dye_Cloth_Inspect Set PrtCount=PrtCount+1,PrtDate=getdate(),Prter=''' + Trim(DName) + '''');
+//          sql.Add(' where CIID=''' + Trim(Order_Main.fieldbyname('CIID').AsString) + '''');
+//          ExecSQL;
+//        end;
+//
+//        with ADOQueryPrint do
+//        begin
+//          Close;
+//          SQL.Clear;
+//          sql.Add(' EXEC P_Dye_Insp_Prt_Lab ');
+//          SQL.Add(' @CIID=''' + Trim(Order_Main.fieldbyname('CIID').AsString) + '''');
+//          Open;
+//        end;
+//        if ADOQueryPrint.IsEmpty then
+//        begin
+//          application.MessageBox('标签内容未找到！', '提示信息', MB_ICONERROR);
+//          exit;
+//        end;
+//
+//        FLBName := Trim(ADOQueryPrint.fieldbyname('LBName').AsString);
+//        ExportFtErpFile(FLBName + '.rmf', ADOQueryTemp);
+//
+//        fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + FLBName + '.rmf';
+//
+//        if FileExists(fPrintFile) then
+//        begin
+//          RM1.LoadFromFile(fPrintFile);
+//          Rm1.DefaultCopies := 2;
+//          RM1.PrintReport;
+//        end
+//        else
+//        begin
+//          Application.MessageBox(PChar('没有找' + fPrintFile), '提示', 0);
+//        end;
+//      end;
+//      Next;
+//    end;
+//  end;
+//  Order_Main.EnableControls;
+//end;
+
 procedure TfrmDyeClothInspList.OrderNoKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #13 then