cai 20260206 17.32

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

@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</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.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</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.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.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.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.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm</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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.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.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.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.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.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm</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.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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>
     <Transaction>2025/10/13 14:35:20.000.136,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyeGreyClothStkStats.pas</Transaction>

F01染色坯布仓库/U_DyeGreyClothInEdit.dfm

@@ -11,7 +11,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
   Position = poScreenCenter
   OnClose = FormClose
   OnKeyDown = FormKeyDown
-  ExplicitLeft = -471
+  ExplicitLeft = -489
   ExplicitWidth = 1356
   ExplicitHeight = 585
   PixelsPerInch = 96
@@ -24,6 +24,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
     Height = 508
     Align = alClient
     TabOrder = 0
+    ExplicitTop = 44
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -178,6 +179,13 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
         HeaderAlignmentHorz = taCenter
         Width = 90
       end
+      object Tv1F_description: TcxGridDBColumn
+        Caption = #22383#24067#25551#36848
+        DataBinding.FieldName = 'F_description'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object Tv1Column5: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'

F01染色坯布仓库/U_DyeGreyClothInEdit.pas

@@ -57,6 +57,7 @@ type
     Tv1Column8: TcxGridDBColumn;
     Tv1C_Code: TcxGridDBColumn;
     TbImport: TToolButton;
+    Tv1F_description: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBAddClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -823,6 +824,8 @@ begin
       Self.CDS_Sub.FieldByName('F_Name').Value := Order_Main.fieldbyname('F_Name').asstring;
 
       Self.CDS_Sub.FieldByName('finishDescription').Value := Order_Main.fieldbyname('C_description').asstring;
+      Self.CDS_Sub.FieldByName('F_description').Value := Order_Main.fieldbyname('F_description').asstring;
+
       //      showMessage(Order_Main.FieldByName('finishDescription').AsString);
       //      initGlide();
     end;

F01染色坯布仓库/U_DyeGreyClothInList.dfm

@@ -229,6 +229,7 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 97
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -429,6 +430,13 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
         HeaderAlignmentHorz = taCenter
         Width = 90
       end
+      object Tv1F_description: TcxGridDBColumn
+        Caption = #22383#24067#25551#36848
+        DataBinding.FieldName = 'F_description'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object Tv1DlyDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'

F01染色坯布仓库/U_DyeGreyClothInList.pas

@@ -77,6 +77,7 @@ type
     Tv1Material: TcxGridDBColumn;
     Tv1finishDescription: TcxGridDBColumn;
     Tv1DlyDate: TcxGridDBColumn;
+    Tv1F_description: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);

F01染色坯布仓库/U_DyeGreyClothOutEdit.dfm

@@ -284,6 +284,13 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit
         HeaderAlignmentHorz = taCenter
         Width = 90
       end
+      object Tv1F_description: TcxGridDBColumn
+        Caption = #22383#24067#25551#36848
+        DataBinding.FieldName = 'F_description'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object Tv1DlyDate: TcxGridDBColumn
         Tag = 2
         Caption = #20132#36135#26085#26399

F01染色坯布仓库/U_DyeGreyClothOutEdit.pas

@@ -48,6 +48,7 @@ type
     v1Column14: TcxGridDBColumn;
     v1Column12: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
+    Tv1F_description: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBAddClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -131,6 +132,7 @@ begin
               FieldByName('DlyDate').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('DlyDate').Value;
 
               FieldByName('Note').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('Note').Value;
+              FieldByName('F_description').Value := frmDyeGreyClothStkSel.CDS_Main.fieldbyname('F_description').Value;
 
             end;
             frmDyeGreyClothStkSel.CDS_Main.Delete;

F01染色坯布仓库/U_DyeGreyClothOutList.dfm

@@ -434,6 +434,13 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
         HeaderAlignmentHorz = taCenter
         Width = 90
       end
+      object Tv1F_description: TcxGridDBColumn
+        Caption = #22383#24067#25551#36848
+        DataBinding.FieldName = 'F_description'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object Tv1DlyDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'

F01染色坯布仓库/U_DyeGreyClothOutList.pas

@@ -78,6 +78,7 @@ type
     v1Column14: TcxGridDBColumn;
     v1Column12: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
+    Tv1F_description: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);

F01染色坯布仓库/U_DyeGreyClothStkList.dfm

@@ -369,6 +369,13 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
         HeaderAlignmentHorz = taCenter
         Width = 104
       end
+      object Tv1F_description: TcxGridDBColumn
+        Caption = #22383#24067#25551#36848
+        DataBinding.FieldName = 'F_description'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object v1Column14: TcxGridDBColumn
         Tag = 2
         Caption = #26469#33258#21333#20301

F01染色坯布仓库/U_DyeGreyClothStkList.pas

@@ -62,6 +62,7 @@ type
     Tv1QtyUnit: TcxGridDBColumn;
     Tv1Note: TcxGridDBColumn;
     TbExport: TToolButton;
+    Tv1F_description: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBRafreshClick(Sender: TObject);

F01染色坯布仓库/U_DyeGreyClothStkSel.dfm

@@ -11,6 +11,7 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel
   Position = poMainFormCenter
   OnClose = FormClose
   OnKeyDown = FormKeyDown
+  ExplicitLeft = -297
   ExplicitWidth = 1181
   ExplicitHeight = 566
   PixelsPerInch = 96
@@ -179,6 +180,7 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 71
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -374,6 +376,13 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel
         HeaderAlignmentHorz = taCenter
         Width = 90
       end
+      object Tv1F_description: TcxGridDBColumn
+        Caption = #22383#24067#25551#36848
+        DataBinding.FieldName = 'F_description'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object Tv1DlyDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'

F01染色坯布仓库/U_DyeGreyClothStkSel.pas

@@ -66,6 +66,7 @@ type
     v1Column14: TcxGridDBColumn;
     v1Column12: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
+    Tv1F_description: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBRafreshClick(Sender: TObject);

F01染色坯布仓库/U_DyePlanForCardSel.dfm

@@ -186,6 +186,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 109
     object Tv1: TcxGridDBTableView
       OnDblClick = Tv1DblClick
       Navigator.Buttons.CustomButtons = <>

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

@@ -1,62 +1,62 @@
 <?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.716,=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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.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.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.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.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.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</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.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.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.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.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.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas</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.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm</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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.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.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.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.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm</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.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.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.383,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_CraftSel.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</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.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas</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.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</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.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.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.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.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.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>

F02染色计划单/U_CraftSel.dfm

@@ -22,6 +22,7 @@ inherited frmCraftSel: TfrmCraftSel
     Height = 476
     Align = alClient
     TabOrder = 0
+    ExplicitTop = 88
     object TV1: TcxGridDBTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
@@ -100,7 +101,6 @@ inherited frmCraftSel: TfrmCraftSel
     ParentFont = False
     ShowCaptions = True
     TabOrder = 1
-    ExplicitTop = -6
     object ToolButton1: TToolButton
       Left = 0
       Top = 0

F02染色计划单/U_DyePlanCardInput.dfm

@@ -46,8 +46,6 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
         Properties.ActivePage = cxTabSheet3
         Properties.CustomButtons.Buttons = <>
         Properties.Style = 6
-        ExplicitLeft = 0
-        ExplicitTop = -3
         ClientRectBottom = 568
         ClientRectRight = 1444
         ClientRectTop = 32
@@ -184,10 +182,10 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               Font.Height = -12
               Font.Name = #23435#20307
               Font.Style = []
-              ItemIndex = 0
+              ItemIndex = 1
               ParentFont = False
               TabOrder = 3
-              Text = #27491#24120#21345
+              Text = #26679#24067#21345
               Items.Strings = (
                 #27491#24120#21345
                 #26679#24067#21345
@@ -208,7 +206,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               TabOrder = 4
             end
             object Button2: TButton
-              Left = 782
+              Left = 969
               Top = 6
               Width = 74
               Height = 33
@@ -220,10 +218,11 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               Font.Style = [fsBold]
               ParentFont = False
               TabOrder = 5
+              Visible = False
               OnClick = Button2Click
             end
             object avgCard: TButton
-              Left = 862
+              Left = 1049
               Top = 6
               Width = 93
               Height = 33
@@ -235,8 +234,24 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               Font.Style = [fsBold]
               ParentFont = False
               TabOrder = 6
+              Visible = False
               OnClick = avgCardClick
             end
+            object TbKaiKa: TButton
+              Left = 817
+              Top = 6
+              Width = 74
+              Height = 33
+              Caption = #24320#21345
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clWindowText
+              Font.Height = -19
+              Font.Name = #23435#20307
+              Font.Style = [fsBold]
+              ParentFont = False
+              TabOrder = 7
+              OnClick = TbKaiKaClick
+            end
           end
           object pnlOrder: TPanel
             Left = 0
@@ -385,7 +400,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
             end
             object Label8: TLabel
               Left = 43
-              Top = 74
+              Top = 76
               Width = 52
               Height = 12
               Caption = #20135#21697#22791#27880
@@ -564,7 +579,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
             object CINote: TEdit
               Tag = 2
               Left = 101
-              Top = 69
+              Top = 71
               Width = 620
               Height = 20
               Font.Charset = GB2312_CHARSET
@@ -619,7 +634,6 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
             ParentFont = False
             PopupMenu = PM_2
             TabOrder = 2
-            ExplicitLeft = 3
             ExplicitTop = 1
             object TV2: TcxGridDBTableView
               OnDblClick = TV2DblClick
@@ -1151,6 +1165,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               Font.Name = #23435#20307
               Font.Style = []
               ParentFont = False
+              ReadOnly = True
               TabOrder = 10
             end
             object PCType1: TComboBox
@@ -1765,13 +1780,13 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
   end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_DyePlan.ADOLink
-    Left = 185
+    Left = 129
-    Top = 408
+    Top = 360
   end
   inherited ADOQueryBaseTemp: TADOQuery
     Connection = DataLink_DyePlan.ADOLink
-    Left = 81
+    Left = 41
-    Top = 409
+    Top = 361
   end
   inherited ImageList_new32: TImageList
     Left = 1328
@@ -1797,8 +1812,8 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_DyePlan.ADOLink
     Parameters = <>
-    Left = 280
+    Left = 216
-    Top = 412
+    Top = 356
   end
   object ADOQueryTmp: TADOQuery
     Connection = DataLink_DyePlan.ADOLink
@@ -1816,8 +1831,8 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
     Connection = DataLink_DyePlan.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 368
+    Left = 296
-    Top = 408
+    Top = 360
   end
   object DS_2: TDataSource
     DataSet = CDS_2

F02染色计划单/U_DyePlanCardInput.pas

@@ -193,6 +193,7 @@ type
     Label32: TLabel;
     Tv3note: TcxGridDBColumn;
     TV2note: TcxGridDBColumn;
+    TbKaiKa: TButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -227,6 +228,7 @@ type
     procedure DTMPSlist1BtnClick(Sender: TObject);
     procedure PCPiece1Change(Sender: TObject);
     procedure PCQty1Change(Sender: TObject);
+    procedure TbKaiKaClick(Sender: TObject);
   private
     FC_Code: string;
     FRollNum: integer;
@@ -381,7 +383,7 @@ begin
       sql.Add(' from BS_Cloth_IO A where isnull(STKName,'''')=''染色坯布'' ');
       SQL.Add(' and A.IOFlag=''入库''   ');
 //      SQL.Add(' and EXISTS(select * from [dbo].[F_Tool_SplitString](' + quotedstr(FGC_STKID) + ','','' ) X where X.RTValue=A.StkId AND ISNULL(RTValue,'''')<>'''')  ');
-      SQL.Add(' and A.OrderNo= ' + QuotedStr(trim(OrderNo1.Text)));
+      SQL.Add(' and A.OrderNo= ' + QuotedStr(trim(OrderNo.Text)));
 //      ShowMessage(sql.Text);
       Open;
     end;
@@ -884,6 +886,7 @@ begin
         FieldByName('GC_STKID').Value := trim(FGC_STKID);
         FieldByName('GC_Position').Value := trim(FGC_Position);
         FieldByName('DTMPSlist').Value := trim(DTMPSlist.Text);
+        FieldByName('DTMID').Value := Trim(DTMID.Text);
         FieldByName('C_description').Value := trim(C_description.Text);
 
         FieldByName('bzunit').Value := trim(Fbzunit);
@@ -1030,23 +1033,60 @@ var
 begin
 
   // 验证输入
-//  if trim(C_Name.Text) = '' then
+  if trim(AbnormalKaZu.Text) = '' then
-//  begin
+  begin
-//    application.MessageBox('产品名称不能为空！', '提示信息', MB_ICONERROR);
+    application.MessageBox('请先选择异常卡组！', '提示信息', MB_ICONERROR);
-//    exit;
+    exit;
-//  end;
+  end;
-//
+
+  if StrToInt(trim(carNum1.Text)) <= 0 then
+  begin
+    application.MessageBox('车数需大于0！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+  if StrToInt(trim(carNum2.Text)) <= 0 then
+  begin
+    application.MessageBox('车数需大于0！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+  if StrToInt(trim(PCPiece1.Text)) <= 0 then
+  begin
+    application.MessageBox('开卡匹数需大于0！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+  if StrToInt(trim(PCPiece2.Text)) <= 0 then
+  begin
+    application.MessageBox('开卡匹数需大于0！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+  if StrToInt(trim(PCQty1.Text)) <= 0 then
+  begin
+    application.MessageBox('开卡数量需大于0！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+  if StrToInt(trim(PCQty2.Text)) <= 0 then
+  begin
+    application.MessageBox('开卡数量需大于0！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+
+  if trim(OrderNo1.Text) = '' then
+  begin
+    application.MessageBox('计划单号不能为空！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+
 //  if (StrToFloatDef(PCPiece.Text, 0) + StrToFloatDef(PCQty.Text, 0)) = 0 then
 //  begin
 //    application.MessageBox('开卡匹数、数量不能都为零！', '提示信息', MB_OK);
 //    exit;
 //  end;
 //
-//  if DTMPSlist.Text = '' then
+  if DTMPSlist1.Text = '' then
-//  begin
+  begin
-//    application.MessageBox('产品工序不能为空！', '提示信息', MB_OK);
+    application.MessageBox('产品工序不能为空！', '提示信息', MB_OK);
-//    exit;
+    exit;
-//  end;
+  end;
 
   // 获取车数
   if strtointdef(trim(carNum1.text), 0) <= 1 then
@@ -1180,6 +1220,7 @@ begin
         FieldByName('GC_STKID').Value := trim(FGC_STKID);
 //        FieldByName('GC_Position').Value := trim(FGC_Position);
         FieldByName('DTMPSlist').Value := trim(DTMPSlist1.Text);
+        FieldByName('DTMID').Value := Trim(DTMID1.Text);
         FieldByName('C_description').Value := Trim(CDS_3.FieldByName('C_description').AsString);
 
 //        FieldByName('bzunit').Value := trim(Fbzunit);
@@ -1313,6 +1354,20 @@ begin
     application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
   end;
 end;
+
+procedure TfrmDyePlanCardInput.TbKaiKaClick(Sender: TObject);
+begin
+  if strtointdef(trim(carNum.text), 1) <= 1 then
+  begin
+    Button2.Click;
+  end
+  else
+  begin
+    avgCard.Click;
+  end;
+
+end;
+
 //var
 //  maxId: string;
 //begin
@@ -1485,6 +1540,7 @@ begin
         FieldByName('GC_STKID').Value := trim(FGC_STKID);
         FieldByName('GC_Position').Value := trim(FGC_Position);
         FieldByName('DTMPSlist').Value := trim(DTMPSlist.Text);
+        FieldByName('DTMID').Value := Trim(DTMID.Text);
         FieldByName('C_description').Value := trim(C_description.Text);
         FieldByName('bzunit').Value := trim(Fbzunit);
 
@@ -1519,6 +1575,7 @@ begin
         Sql.Add('exec P_Dye_GreyCloth_Out ');
         Sql.Add('@PCID=' + quotedstr(trim(maxId)));
         Sql.Add(',@Filler=' + quotedstr(trim(DName)));
+//        ShowMessage(sql.Text);
         Open;
       end;
       if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
@@ -2006,10 +2063,10 @@ end;
 procedure TfrmDyePlanCardInput.TV2DblClick(Sender: TObject);
 begin
   inherited;
-  if OrderNo.Text = '' then
+//  if OrderNo.Text = '' then
-  begin
+//  begin
-    Exit;
+//    Exit;
-  end;
+//  end;
   with ADOQueryTmp do
   begin
     Close;
@@ -2017,6 +2074,8 @@ begin
     SQL.Add(' select * from BS_Cloth_info where C_Name = ' + QuotedStr(Trim(CDS_2.FieldByName('C_Name').Value)));
     Open;
   end;
+
+  OrderNo.Text := CDS_2.FieldByName('OrderNo').AsString;
   C_Width.Text := ADOQueryTmp.FieldByName('C_Width').AsString;
 
   C_GramWeight.Text := ADOQueryTmp.FieldByName('C_GramWeight').AsString;
@@ -2050,6 +2109,8 @@ begin
   FC_Name := ADOQueryTmp.FieldByName('C_Name').AsString;
 //  C_Width.Text := ADOQueryTmp.FieldByName('C_Width').Value;
 //  C_Width.Text := ADOQueryTmp.FieldByName('C_Width').Value;
+
+  InitGreyClothStk();
 end;
 
 //procedure TfrmDyePlanCardInput.TV3Column1PropertiesEditValueChanged(Sender: TObject);

F02染色计划单/U_DyePlanCardList.dfm

@@ -3,6 +3,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
   ClientHeight = 632
   ClientWidth = 1503
   OnKeyDown = FormKeyDown
+  ExplicitLeft = -652
   ExplicitWidth = 1519
   ExplicitHeight = 671
   PixelsPerInch = 96
@@ -186,7 +187,6 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    ExplicitTop = 44
     object Label1: TLabel
       Left = 23
       Top = 15
@@ -478,7 +478,6 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 2
-    ExplicitTop = 125
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -899,7 +898,6 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       #24322#24120#21345
       #20840#37096)
     OnChange = cxTabControl1Change
-    ExplicitTop = 99
     ClientRectBottom = 22
     ClientRectRight = 1503
     ClientRectTop = 19

F02染色计划单/U_DyePlanForCardSel.dfm

@@ -200,7 +200,6 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
-      OptionsData.Editing = False
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       OptionsView.Indicator = True
@@ -229,6 +228,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         DataBinding.FieldName = 'OrderNo'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Options.Focusing = False
         Styles.Header = DataLink_DyePlan.Default
         Width = 72
@@ -238,6 +238,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         DataBinding.FieldName = 'C_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Options.Focusing = False
         Styles.Header = DataLink_DyePlan.Default
         Width = 82
@@ -256,6 +257,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         DataBinding.FieldName = 'F_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 90
       end
       object Tv1OrdDate: TcxGridDBColumn
@@ -263,6 +265,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         DataBinding.FieldName = 'OrdDate'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 90
       end
       object Tv1QtyOrder: TcxGridDBColumn
@@ -270,6 +273,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         DataBinding.FieldName = 'QtyOrder'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 90
       end
       object Tv1DlyDate: TcxGridDBColumn
@@ -279,6 +283,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Options.Focusing = False
         Styles.Header = DataLink_DyePlan.Default
         Width = 93
@@ -288,6 +293,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         DataBinding.FieldName = 'C_PlanQty'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 90
       end
       object Tv1F_description: TcxGridDBColumn
@@ -295,6 +301,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         DataBinding.FieldName = 'F_description'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 90
       end
       object Tv1Column16: TcxGridDBColumn
@@ -302,6 +309,7 @@ object frmProductOrderListSel: TfrmProductOrderListSel
         DataBinding.FieldName = 'ORDNOTE'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 66
       end
     end

F02染色计划单/U_DyePlanInPut.dfm

@@ -367,8 +367,6 @@ object frmDyePlanInPut: TfrmDyePlanInPut
     TabOrder = 2
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 6
-    ExplicitTop = 359
-    ExplicitHeight = 438
     ClientRectBottom = 400
     ClientRectRight = 1376
     ClientRectTop = 0
@@ -398,7 +396,6 @@ object frmDyePlanInPut: TfrmDyePlanInPut
     ParentFont = False
     ShowCaptions = True
     TabOrder = 3
-    ExplicitTop = 321
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -439,8 +436,6 @@ object frmDyePlanInPut: TfrmDyePlanInPut
     Font.Style = []
     ParentFont = False
     TabOrder = 4
-    ExplicitTop = 359
-    ExplicitHeight = 438
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

F02染色计划单/U_DyeProcessDefin.dfm

@@ -63,7 +63,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
     Height = 772
     Align = alClient
     TabOrder = 0
-    Properties.ActivePage = PD
+    Properties.ActivePage = CCQX
     Properties.CustomButtons.Buttons = <>
     ClientRectBottom = 770
     ClientRectLeft = 2
@@ -79,40 +79,55 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         Height = 748
         Align = alClient
         TabOrder = 0
+        object Label3: TLabel
+          Left = 27
+          Top = 60
+          Width = 60
+          Height = 12
+          Caption = #21333#25490#38024#36711#27611
+        end
+        object Label4: TLabel
+          Left = 27
+          Top = 132
+          Width = 60
+          Height = 12
+          Caption = #21452#25490#38024#36711#27611
+        end
         object cxLabel336: TcxLabel
-          Left = 29
+          Left = 37
-          Top = 73
+          Top = 107
           Caption = #20027#30005#26426'('#27425'/min)'
         end
         object cxLabel337: TcxLabel
-          Left = 3
+          Left = 4
           Top = 22
           Caption = #24037#24207#21442#25968':'
         end
         object cxLabel339: TcxLabel
-          Left = 29
+          Left = 37
-          Top = 46
+          Top = 80
           Caption = #36827#20986#26009'(m/min)'
         end
         object cxLabel342: TcxLabel
-          Left = 4
+          Left = 20
-          Top = 124
+          Top = 219
           Caption = #22791#27880
         end
         object cxLabel344: TcxLabel
-          Left = 359
+          Left = 367
-          Top = 73
+          Top = 107
           Caption = #38024#26495#39640#24230'(cm)'
         end
         object cxLabel345: TcxLabel
-          Left = 359
+          Left = 367
-          Top = 46
+          Top = 79
           Caption = #31867#22411
+          Visible = False
         end
         object zm_inout: TcxTextEdit
           Tag = 2
-          Left = 121
+          Left = 129
-          Top = 46
+          Top = 80
           Style.LookAndFeel.SkinName = 'WXI'
           StyleDisabled.LookAndFeel.SkinName = 'WXI'
           StyleFocused.LookAndFeel.SkinName = 'WXI'
@@ -122,8 +137,8 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         end
         object zm_mainElec: TcxTextEdit
           Tag = 2
-          Left = 121
+          Left = 129
-          Top = 70
+          Top = 104
           Style.LookAndFeel.SkinName = 'WXI'
           StyleDisabled.LookAndFeel.SkinName = 'WXI'
           StyleFocused.LookAndFeel.SkinName = 'WXI'
@@ -133,8 +148,8 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         end
         object zm_needleHigh: TcxTextEdit
           Tag = 2
-          Left = 439
+          Left = 447
-          Top = 71
+          Top = 104
           Style.LookAndFeel.SkinName = 'WXI'
           StyleDisabled.LookAndFeel.SkinName = 'WXI'
           StyleFocused.LookAndFeel.SkinName = 'WXI'
@@ -144,8 +159,8 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         end
         object zm_Precautions: TcxTextEdit
           Tag = 2
-          Left = 44
+          Left = 60
-          Top = 110
+          Top = 205
           AutoSize = False
           Style.LookAndFeel.SkinName = 'WXI'
           StyleDisabled.LookAndFeel.SkinName = 'WXI'
@@ -157,8 +172,8 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         end
         object zm_style: TcxComboBox
           Tag = 2
-          Left = 439
+          Left = 447
-          Top = 46
+          Top = 79
           Properties.Items.Strings = (
             ''
             #21333#25490#38024
@@ -168,6 +183,55 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
           StyleFocused.LookAndFeel.SkinName = 'WXI'
           StyleHot.LookAndFeel.SkinName = 'WXI'
           TabOrder = 10
+          Visible = False
+          Width = 150
+        end
+        object cxLabel289: TcxLabel
+          Left = 37
+          Top = 180
+          Caption = #20027#30005#26426'('#27425'/min)'
+        end
+        object cxLabel328: TcxLabel
+          Left = 37
+          Top = 153
+          Caption = #36827#20986#26009'(m/min)'
+        end
+        object cxLabel329: TcxLabel
+          Left = 367
+          Top = 180
+          Caption = #38024#26495#39640#24230'(cm)'
+        end
+        object zm_inout2: TcxTextEdit
+          Tag = 2
+          Left = 129
+          Top = 153
+          Style.LookAndFeel.SkinName = 'WXI'
+          StyleDisabled.LookAndFeel.SkinName = 'WXI'
+          StyleFocused.LookAndFeel.SkinName = 'WXI'
+          StyleHot.LookAndFeel.SkinName = 'WXI'
+          TabOrder = 14
+          Width = 150
+        end
+        object zm_mainElec2: TcxTextEdit
+          Tag = 2
+          Left = 129
+          Top = 177
+          Style.LookAndFeel.SkinName = 'WXI'
+          StyleDisabled.LookAndFeel.SkinName = 'WXI'
+          StyleFocused.LookAndFeel.SkinName = 'WXI'
+          StyleHot.LookAndFeel.SkinName = 'WXI'
+          TabOrder = 15
+          Width = 150
+        end
+        object zm_needleHigh2: TcxTextEdit
+          Tag = 2
+          Left = 447
+          Top = 177
+          Style.LookAndFeel.SkinName = 'WXI'
+          StyleDisabled.LookAndFeel.SkinName = 'WXI'
+          StyleFocused.LookAndFeel.SkinName = 'WXI'
+          StyleHot.LookAndFeel.SkinName = 'WXI'
+          TabOrder = 16
           Width = 150
         end
       end
@@ -182,7 +246,6 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         Height = 317
         Align = alClient
         TabOrder = 0
-        ExplicitTop = -6
         object ccqx_note: TcxTextEdit
           Tag = 2
           Left = 58
@@ -4495,7 +4558,6 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         Height = 748
         Align = alClient
         TabOrder = 0
-        ExplicitLeft = 3
         object cxLabel280: TcxLabel
           Left = 284
           Top = 40

F02染色计划单/U_DyeProcessDefin.pas

@@ -808,6 +808,14 @@ type
     pd_temperature: TcxTextEdit;
     pd_speed: TcxTextEdit;
     cxLabel282: TcxLabel;
+    Label3: TLabel;
+    Label4: TLabel;
+    cxLabel289: TcxLabel;
+    cxLabel328: TcxLabel;
+    cxLabel329: TcxLabel;
+    zm_inout2: TcxTextEdit;
+    zm_mainElec2: TcxTextEdit;
+    zm_needleHigh2: TcxTextEdit;
     procedure FormShow(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure TbSaveClick(Sender: TObject);
@@ -1006,6 +1014,7 @@ begin
     sql.Clear;
     sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
     sql.Add(' where gytype=''낀났헌求'' and A.PSID=''' + Trim(FPSID) + '''');
+    SQL.Add(' Order By A.serialno');
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_1);
@@ -1017,6 +1026,7 @@ begin
     sql.Clear;
     sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
     sql.Add(' where gytype=''얩횡멂헌求'' and A.PSID=''' + Trim(FPSID) + '''');
+    SQL.Add(' Order By A.serialno');
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_2);
@@ -1028,6 +1038,7 @@ begin
     sql.Clear;
     sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
     sql.Add(' where gytype=''샙멂헌求'' and A.PSID=''' + Trim(FPSID) + '''');
+    SQL.Add(' Order By A.serialno');
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_3);
@@ -1039,6 +1050,7 @@ begin
     sql.Clear;
     sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
     sql.Add(' where gytype=''苟彊땍謹'' and A.PSID=''' + Trim(FPSID) + '''');
+    SQL.Add(' Order By A.serialno');
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_4);
@@ -1050,6 +1062,7 @@ begin
     sql.Clear;
     sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
     sql.Add(' where gytype=''랙텟'' and A.PSID=''' + Trim(FPSID) + '''');
+    SQL.Add(' Order By A.serialno');
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_6);
@@ -1061,6 +1074,7 @@ begin
     sql.Clear;
     sql.Add('select A.*  from Bs_Cloth_GY_sub A ');
     sql.Add(' where gytype=''민스'' and A.PSID=''' + Trim(FPSID) + '''');
+    SQL.Add(' Order By A.serialno');
     Open;
   end;
   SCreateCDS(ADOQueryTemp, CDS_5);

F02染色计划单/U_DyeProcessDefinKaika.dfm

@@ -30,7 +30,6 @@ object frmDyeProcessDefinKaika: TfrmDyeProcessDefinKaika
     ParentColor = False
     ShowCaptions = True
     TabOrder = 1
-    ExplicitTop = 2
     object TBClose: TToolButton
       Left = 0
       Top = 0
@@ -47,7 +46,7 @@ object frmDyeProcessDefinKaika: TfrmDyeProcessDefinKaika
     Height = 772
     Align = alClient
     TabOrder = 0
-    Properties.ActivePage = ZM
+    Properties.ActivePage = RGQX
     Properties.CustomButtons.Buttons = <>
     ClientRectBottom = 770
     ClientRectLeft = 2
@@ -653,7 +652,6 @@ object frmDyeProcessDefinKaika: TfrmDyeProcessDefinKaika
         TabOrder = 2
         Transparent = True
         Visible = False
-        ExplicitTop = 203
         object TbrgqxAdd: TToolButton
           Left = 0
           Top = 0

F02染色计划单/U_DyeSimpleTechnicsKaiKa.pas

@@ -16,7 +16,7 @@ uses
   dxBarBuiltInMenu, Menus, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters,
   dxDateRanges, dxScrollbarAnnotations, cxContainer, cxDropDownEdit, cxLabel,
   cxButtons, cxMemo, U_frameFPList, U_frameGJList, U_frameGDXList, U_frameFSList,
-  U_frameCCQXList, U_frameJGQXList, U_frameRGQXList, U_frameYMList, U_BaseInput,
+  U_frameCCQXList, U_frameJGQXList, U_frameRGQXList, U_frameYMList,U_framePDList, U_BaseInput,
   System.ImageList, Vcl.ImgList;
 
   //U_frameJGQXList, U_frameRGQXList, U_frameCCQXList, U_frameYMList
@@ -81,7 +81,6 @@ type
     procedure InitGXDetails();
     procedure CloseAllFrames();
 
-
     function GetNextFrameTop: Integer;
 //    function SaveData(): Boolean;
     procedure FillAllTextEditsWithValue(AParent: TWinControl; const AHint, AValue: string; AExclude: TcxTextEdit = nil);
@@ -104,6 +103,7 @@ var
   frameRGQXList1, frameRGQXList2, frameRGQXList3: TframeRGQXList;
   frameCCQXList1, frameCCQXList2, frameCCQXList3: TframeCCQXList;
   frameYMList1, frameYMList2, frameYMList3: TframeYMList;
+  framePDList1, framePDList2, framePDList3: TframePDList;
 
 implementation
 
@@ -161,8 +161,6 @@ begin
 
 end;
 
-
-
 procedure TfrmDyeSimpleTechnicsKaiKa.InitGlide();
 begin
   try
@@ -209,6 +207,7 @@ begin
         sql.Add(' select A.* FROM BS_Cloth_GY_Sub_Kaika A');
         sql.Add(' Where A.PSID=''' + trim(CDS_GX.fieldbyname('PSID').AsString) + '''');
         sql.Add(' and A.PCID=''' + trim(fKaZu) + '''');
+        SQL.Add(' Order By A.serialno');
 //        ShowMessage(SQL.Text);
         Open;
       end;
@@ -226,6 +225,7 @@ begin
           frameCCQXList1.Parent := self.ScrollBox1;
           frameCCQXList1.Top := GetNextFrameTop;
           frameCCQXList1.Visible := True;
+          frameCCQXList1.LabelCCQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameCCQXList1.InitGrid();
 
           frameCCQXList1.TbCCQXAdd.Visible := False;
@@ -249,6 +249,7 @@ begin
           frameCCQXList2.Parent := self.ScrollBox1;
           frameCCQXList2.Top := GetNextFrameTop;
           frameCCQXList2.Visible := True;
+          frameCCQXList2.LabelCCQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameCCQXList2.InitGrid();
 
           frameCCQXList2.TbCCQXAdd.Visible := False;
@@ -272,6 +273,7 @@ begin
           frameCCQXList3.Parent := self.ScrollBox1;
           frameCCQXList3.Top := GetNextFrameTop;
           frameCCQXList3.Visible := True;
+          frameCCQXList3.LabelCCQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameCCQXList3.InitGrid();
 
           frameCCQXList3.TbCCQXAdd.Visible := False;
@@ -297,6 +299,7 @@ begin
           frameRGQXList1.Parent := self.ScrollBox1;
           frameRGQXList1.Top := GetNextFrameTop;
           frameRGQXList1.Visible := True;
+          frameRGQXList1.LabelRGQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameRGQXList1.InitGrid();
 
           frameRGQXList1.TbRGQXAdd.Visible := False;
@@ -319,6 +322,7 @@ begin
           frameRGQXList2.Parent := self.ScrollBox1;
           frameRGQXList2.Top := GetNextFrameTop;
           frameRGQXList2.Visible := True;
+          frameRGQXList2.LabelRGQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameRGQXList2.InitGrid();
 
           frameRGQXList2.TbRGQXAdd.Visible := False;
@@ -341,6 +345,7 @@ begin
           frameRGQXList3.Parent := self.ScrollBox1;
           frameRGQXList3.Top := GetNextFrameTop;
           frameRGQXList3.Visible := True;
+          frameRGQXList3.LabelRGQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameRGQXList3.InitGrid();
 
           frameRGQXList3.TbRGQXAdd.Visible := False;
@@ -366,6 +371,7 @@ begin
           frameJGQXList1.Parent := self.ScrollBox1;
           frameJGQXList1.Top := GetNextFrameTop;
           frameJGQXList1.Visible := True;
+          frameJGQXList1.LabelJGQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameJGQXList1.InitGrid();
 
           frameJGQXList1.TbJGQXAdd.Visible := False;
@@ -388,6 +394,7 @@ begin
           frameJGQXList2.Parent := self.ScrollBox1;
           frameJGQXList2.Top := GetNextFrameTop;
           frameJGQXList2.Visible := True;
+          frameJGQXList2.LabelJGQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameJGQXList2.InitGrid();
 
           frameJGQXList2.TbJGQXAdd.Visible := False;
@@ -410,6 +417,7 @@ begin
           frameJGQXList3.Parent := self.ScrollBox1;
           frameJGQXList3.Top := GetNextFrameTop;
           frameJGQXList3.Visible := True;
+          frameJGQXList3.LabelJGQX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameJGQXList3.InitGrid();
 
           frameJGQXList3.TbJGQXAdd.Visible := False;
@@ -435,6 +443,7 @@ begin
           frameGDXList1.Parent := self.ScrollBox1;
           frameGDXList1.Top := GetNextFrameTop;
           frameGDXList1.Visible := True;
+          frameGDXList1.LabelGDX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameGDXList1.InitGrid();
 
           CDS_GX.Edit;
@@ -451,9 +460,9 @@ begin
           frameGDXList2.Parent := self.ScrollBox1;
           frameGDXList2.Top := GetNextFrameTop;
           frameGDXList2.Visible := True;
+          frameGDXList2.LabelGDX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameGDXList2.InitGrid();
 
-
           CDS_GX.Edit;
           CDS_GX.FieldByName('page').AsString := 'frameGDXList2';
           CDS_GX.Post;
@@ -468,6 +477,7 @@ begin
           frameGDXList3.Parent := self.ScrollBox1;
           frameGDXList3.Top := GetNextFrameTop;
           frameGDXList3.Visible := True;
+          frameGDXList3.LabelGDX.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameGDXList3.InitGrid();
 
           CDS_GX.Edit;
@@ -487,6 +497,7 @@ begin
           frameFSList1.Parent := self.ScrollBox1;
           frameFSList1.Top := GetNextFrameTop;
           frameFSList1.Visible := True;
+          frameFSList1.LabelFS.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameFSList1.InitGrid();
 
           frameFSList1.TbFSAdd.Visible := False;
@@ -509,6 +520,7 @@ begin
           frameFSList2.Parent := self.ScrollBox1;
           frameFSList2.Top := GetNextFrameTop;
           frameFSList2.Visible := True;
+          frameFSList2.LabelFS.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameFSList2.InitGrid();
 
           frameFSList2.TbFSAdd.Visible := False;
@@ -531,6 +543,7 @@ begin
           frameFSList3.Parent := self.ScrollBox1;
           frameFSList3.Top := GetNextFrameTop;
           frameFSList3.Visible := True;
+          frameFSList3.LabelFS.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameFSList3.InitGrid();
 
           frameFSList3.TbFSAdd.Visible := False;
@@ -557,6 +570,7 @@ begin
           frameFPList1.Parent := self.ScrollBox1;
           frameFPList1.Top := GetNextFrameTop;
           frameFPList1.Visible := True;
+          frameFPList1.LabelFP.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameFPList1.InitGrid();
 
           frameFPList1.TbFPAdd.Visible := False;
@@ -579,6 +593,7 @@ begin
           frameFPList2.Parent := self.ScrollBox1;
           frameFPList2.Top := GetNextFrameTop;
           frameFPList2.Visible := True;
+          frameFPList2.LabelFP.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameFPList2.InitGrid();
 
           frameFPList2.TbFPAdd.Visible := False;
@@ -601,6 +616,7 @@ begin
           frameFPList3.Parent := self.ScrollBox1;
           frameFPList3.Top := GetNextFrameTop;
           frameFPList3.Visible := True;
+          frameFPList3.LabelFP.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameFPList3.InitGrid();
 
           frameFPList3.TbFPAdd.Visible := False;
@@ -627,6 +643,7 @@ begin
           frameGJList1.Parent := self.ScrollBox1;
           frameGJList1.Top := GetNextFrameTop;
           frameGJList1.Visible := True;
+          frameGJList1.LabelGJ.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameGJList1.InitGrid();
 
           frameGJList1.TbGJAdd.Visible := False;
@@ -649,6 +666,7 @@ begin
           frameGJList2.Parent := self.ScrollBox1;
           frameGJList2.Top := GetNextFrameTop;
           frameGJList2.Visible := True;
+          frameGJList2.LabelGJ.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameGJList2.InitGrid();
 
           frameGJList2.TbGJAdd.Visible := False;
@@ -671,6 +689,7 @@ begin
           frameGJList3.Parent := self.ScrollBox1;
           frameGJList3.Top := GetNextFrameTop;
           frameGJList3.Visible := True;
+          frameGJList3.LabelGJ.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameGJList3.InitGrid();
 
           frameGJList3.TbGJAdd.Visible := False;
@@ -696,6 +715,7 @@ begin
           frameYMList1.Parent := self.ScrollBox1;
           frameYMList1.Top := GetNextFrameTop;
           frameYMList1.Visible := True;
+          frameYMList1.LabelYM.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameYMList1.InitGrid();
 
           CDS_GX.Edit;
@@ -713,6 +733,7 @@ begin
           frameYMList2.Parent := self.ScrollBox1;
           frameYMList2.Top := GetNextFrameTop;
           frameYMList2.Visible := True;
+          frameYMList2.LabelYM.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameYMList2.InitGrid();
 
           CDS_GX.Edit;
@@ -730,6 +751,7 @@ begin
           frameYMList3.Parent := self.ScrollBox1;
           frameYMList3.Top := GetNextFrameTop;
           frameYMList3.Visible := True;
+          frameYMList3.LabelYM.Caption := CDS_GX.FieldByName('PSName').AsString;
           frameYMList3.InitGrid();
 
           CDS_GX.Edit;
@@ -739,6 +761,63 @@ begin
           SCSHData(ADOQueryTemp, frameYMList3.Panel_zm, 2);
           frameYMList3.zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
 
+        end;
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = 'ÅÄ´ò' then
+      begin
+        if self.FindComponent('framePDList1') = nil then
+        begin
+          framePDList1 := TframePDList.Create(self);
+          framePDList1.Name := 'framePDList1';
+          framePDList1.Parent := self.ScrollBox1;
+          framePDList1.Top := GetNextFrameTop;
+          framePDList1.Visible := True;
+          framePDList1.LabelPD.Caption := CDS_GX.FieldByName('PSName').AsString;
+          framePDList1.InitGrid();
+
+          CDS_GX.Edit;
+          CDS_GX.FieldByName('page').AsString := 'framePDList1';
+          CDS_GX.Post;
+
+          SCSHData(ADOQueryTemp, framePDList1.Panel_pd, 2);
+//          frameYMList1.zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
+
+        end
+        else if self.FindComponent('framePDList2') = nil then
+        begin
+          framePDList2 := TframePDList.Create(self);
+          framePDList2.Name := 'framePDList2';
+          framePDList2.Parent := self.ScrollBox1;
+          framePDList2.Top := GetNextFrameTop;
+          framePDList2.Visible := True;
+          framePDList2.LabelPD.Caption := CDS_GX.FieldByName('PSName').AsString;
+          framePDList2.InitGrid();
+
+          CDS_GX.Edit;
+          CDS_GX.FieldByName('page').AsString := 'framePDList2';
+          CDS_GX.Post;
+
+          SCSHData(ADOQueryTemp, framePDList2.Panel_pd, 2);
+//          frameYMList2.zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
+
+        end
+        else if self.FindComponent('framePDList3') = nil then
+        begin
+          framePDList3 := TframePDList.Create(self);
+          framePDList3.Name := 'framePDList3';
+          framePDList3.Parent := self.ScrollBox1;
+          framePDList3.Top := GetNextFrameTop;
+          framePDList3.Visible := True;
+          framePDList3.LabelPD.Caption := CDS_GX.FieldByName('PSName').AsString;
+          framePDList3.InitGrid();
+
+          CDS_GX.Edit;
+          CDS_GX.FieldByName('page').AsString := 'framePDList3';
+          CDS_GX.Post;
+
+          SCSHData(ADOQueryTemp, framePDList3.Panel_pd, 2);
+//          frameYMList3.zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
+
         end;
       end;
       CDS_GX.Next;
@@ -826,6 +905,14 @@ begin
       TFrame(Component).Free;
     end;
   end;
+  for i := 1 to 3 do
+  begin
+    Component := self.FindComponent('framePDList' + IntToStr(i));
+    if Component <> nil then
+    begin
+      TFrame(Component).Free;
+    end;
+  end;
 end;
 
 procedure TfrmDyeSimpleTechnicsKaiKa.FormDestroy(Sender: TObject);
@@ -855,7 +942,6 @@ begin
   Close;
 end;
 
-
 procedure TfrmDyeSimpleTechnicsKaiKa.FormShow(Sender: TObject);
 begin
   inherited;
@@ -942,7 +1028,6 @@ begin
   end;
 end;
 
-
 procedure TfrmDyeSimpleTechnicsKaiKa.cxGridDBColumn1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
@@ -1060,8 +1145,6 @@ begin
   end;
 end;
 
-
-
 function TfrmDyeSimpleTechnicsKaiKa.GetNextFrameTop: Integer;
 var
   i: Integer;

F02染色计划单/U_DyeSimpleTechnicsList.dfm

@@ -5,7 +5,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
   ClientWidth = 1540
   Position = poDesigned
   OnKeyDown = FormKeyDown
-  ExplicitLeft = -9
   ExplicitWidth = 1556
   ExplicitHeight = 884
   PixelsPerInch = 96

F02染色计划单/U_DyeSimpleTechnicsList.pas

@@ -310,7 +310,8 @@ begin
       Open;
 
     end;
-
+    ADOQueryMain.Filtered := false;
+//    ShowMessage(IntToStr(ADOQueryMain.RecordCount));
     SCreateCDS(ADOQueryMain, CDS_2);
     SInitCDSData(ADOQueryMain, CDS_2);
 //    ShowMessage(ADOQueryMain.FieldByName('DTMID').AsString);
@@ -776,6 +777,7 @@ begin
         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(' Order By A.serialno');
 //        SQL.Add(' and A.PSID = ''' + trim(CDS_2.fieldbyname('PSID').AsString) + '''');
 
         Open;

F02染色计划单/U_DyeTechnicsinputKaika.dfm

@@ -160,8 +160,6 @@ inherited frmDyeTechnicsinputKaika: TfrmDyeTechnicsinputKaika
       BevelOuter = bvLowered
       Color = clSkyBlue
       TabOrder = 2
-      ExplicitLeft = -4
-      ExplicitTop = 33
       object Label2: TLabel
         Left = 295
         Top = 9

F02染色计划单/U_frameCCQXList.dfm

@@ -179,6 +179,13 @@ object frameCCQXList: TframeCCQXList
         OptionsView.ColumnAutoWidth = True
         OptionsView.GroupByBox = False
         OptionsView.Indicator = True
+        object TvCCQXserialno: TcxGridDBColumn
+          Caption = #24207#21495
+          DataBinding.FieldName = 'serialno'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
         object TvCCQXccqx_Name: TcxGridDBColumn
           Caption = #21161#21058#32534#21495
           DataBinding.FieldName = 'ccqx_Name'
@@ -203,13 +210,6 @@ object frameCCQXList: TframeCCQXList
           HeaderAlignmentHorz = taCenter
           Width = 70
         end
-        object TvCCQXserialno: TcxGridDBColumn
-          Caption = #24207#21495
-          DataBinding.FieldName = 'serialno'
-          DataBinding.IsNullValueType = True
-          Visible = False
-          Width = 60
-        end
         object TvCCQXccqx_spel: TcxGridDBColumn
           Caption = #31867#22411
           DataBinding.FieldName = 'ccqx_spel'

F02染色计划单/U_frameFPList.dfm

@@ -277,6 +277,13 @@ object frameFPList: TframeFPList
         OptionsView.ColumnAutoWidth = True
         OptionsView.GroupByBox = False
         OptionsView.Indicator = True
+        object TvFPserialno: TcxGridDBColumn
+          Caption = #24207#21495
+          DataBinding.FieldName = 'serialno'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
         object cxGridDBColumn14: TcxGridDBColumn
           Caption = #21161#21058#32534#21495
           DataBinding.FieldName = 'fp_Name'
@@ -301,13 +308,6 @@ object frameFPList: TframeFPList
           HeaderAlignmentHorz = taCenter
           Width = 70
         end
-        object TvFPserialno: TcxGridDBColumn
-          Caption = #24207#21495
-          DataBinding.FieldName = 'serialno'
-          DataBinding.IsNullValueType = True
-          Visible = False
-          Width = 60
-        end
         object TvFPfp_spel: TcxGridDBColumn
           Caption = #31867#22411
           DataBinding.FieldName = 'fp_spel'

F02染色计划单/U_frameFSList.dfm

@@ -279,7 +279,7 @@ object frameFSList: TframeFSList
     end
     object cxGrid7: TcxGrid
       Left = 328
-      Top = 6
+      Top = 5
       Width = 200
       Height = 120
       TabOrder = 28
@@ -293,6 +293,13 @@ object frameFSList: TframeFSList
         OptionsView.ColumnAutoWidth = True
         OptionsView.GroupByBox = False
         OptionsView.Indicator = True
+        object TvFSserialno: TcxGridDBColumn
+          Caption = #24207#21495
+          DataBinding.FieldName = 'serialno'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
         object cxGridDBColumn19: TcxGridDBColumn
           Caption = #21161#21058#32534#21495
           DataBinding.FieldName = 'fs_Name'
@@ -317,13 +324,6 @@ object frameFSList: TframeFSList
           HeaderAlignmentHorz = taCenter
           Width = 70
         end
-        object TvFSColumn1: TcxGridDBColumn
-          Caption = #24207#21495
-          DataBinding.FieldName = 'serialno'
-          DataBinding.IsNullValueType = True
-          Visible = False
-          Width = 60
-        end
         object TvFSfs_spel: TcxGridDBColumn
           Caption = #31867#22411
           DataBinding.FieldName = 'fs_spel'

F02染色计划单/U_frameFSList.pas

@@ -60,7 +60,7 @@ type
     TvFS: TcxGridDBTableView;
     cxGridDBColumn19: TcxGridDBColumn;
     cxGridDBColumn22: TcxGridDBColumn;
-    TvFSColumn1: TcxGridDBColumn;
+    TvFSserialno: TcxGridDBColumn;
     cxGridLevel6: TcxGridLevel;
     cxLabel7: TcxLabel;
     TbFSAdd: TcxButton;

F02染色计划单/U_frameGJList.dfm

@@ -262,8 +262,8 @@ object frameGJList: TframeGJList
       Width = 40
     end
     object cxGrid8: TcxGrid
-      Left = 328
+      Left = 333
-      Top = 6
+      Top = 3
       Width = 200
       Height = 120
       Font.Charset = GB2312_CHARSET
@@ -283,6 +283,13 @@ object frameGJList: TframeGJList
         OptionsView.ColumnAutoWidth = True
         OptionsView.GroupByBox = False
         OptionsView.Indicator = True
+        object TvGJserialno: TcxGridDBColumn
+          Caption = #24207#21495
+          DataBinding.FieldName = 'serialno'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
         object cxGridDBColumn24: TcxGridDBColumn
           Caption = #21161#21058#32534#21495
           DataBinding.FieldName = 'gj_Name'
@@ -307,13 +314,6 @@ object frameGJList: TframeGJList
           HeaderAlignmentHorz = taCenter
           Width = 70
         end
-        object TvGJserialno: TcxGridDBColumn
-          Caption = #24207#21495
-          DataBinding.FieldName = 'serialno'
-          DataBinding.IsNullValueType = True
-          Visible = False
-          Width = 60
-        end
         object TvGJgj_spel: TcxGridDBColumn
           Caption = #31867#22411
           DataBinding.FieldName = 'gj_spel'

F02染色计划单/U_frameJGQXList.dfm

@@ -104,6 +104,13 @@ object frameJGQXList: TframeJGQXList
         OptionsView.ColumnAutoWidth = True
         OptionsView.GroupByBox = False
         OptionsView.Indicator = True
+        object TvJGQXserialno: TcxGridDBColumn
+          Caption = #24207#21495
+          DataBinding.FieldName = 'serialno'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
         object cxGridDBColumn9: TcxGridDBColumn
           Caption = #21161#21058#32534#21495
           DataBinding.FieldName = 'jgqx_Name'
@@ -145,13 +152,6 @@ object frameJGQXList: TframeJGQXList
           HeaderAlignmentHorz = taCenter
           Width = 70
         end
-        object TvJGQXserialno: TcxGridDBColumn
-          Caption = #24207#21495
-          DataBinding.FieldName = 'serialno'
-          DataBinding.IsNullValueType = True
-          Visible = False
-          Width = 60
-        end
         object TvJGQXBPIID: TcxGridDBColumn
           Caption = #21161#21058#20027#38190
           DataBinding.FieldName = 'BPIID'

F02染色计划单/U_frameRGQXList.dfm

@@ -88,6 +88,13 @@ object frameRGQXList: TframeRGQXList
         OptionsView.ColumnAutoWidth = True
         OptionsView.GroupByBox = False
         OptionsView.Indicator = True
+        object TvRGQXserialno: TcxGridDBColumn
+          Caption = #24207#21495
+          DataBinding.FieldName = 'serialno'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 60
+        end
         object cxGridDBColumn1: TcxGridDBColumn
           Caption = #21161#21058#32534#21495
           DataBinding.FieldName = 'rgqx_Name'
@@ -112,13 +119,6 @@ object frameRGQXList: TframeRGQXList
           HeaderAlignmentHorz = taCenter
           Width = 70
         end
-        object TvRGQXserialno: TcxGridDBColumn
-          Caption = #24207#21495
-          DataBinding.FieldName = 'serialno'
-          DataBinding.IsNullValueType = True
-          Visible = False
-          Width = 60
-        end
         object TvRGQXrgqx_spel: TcxGridDBColumn
           Caption = #31867#22411
           DataBinding.FieldName = 'rgqx_spel'

F02染色计划单/U_frameYMList.dfm

@@ -2,13 +2,13 @@ object frameYMList: TframeYMList
   Left = 0
   Top = 0
   Width = 1147
-  Height = 61
+  Height = 99
   TabOrder = 0
   object Panel_zm: TPanel
     Left = 0
     Top = 0
     Width = 1147
-    Height = 61
+    Height = 99
     Align = alTop
     TabOrder = 0
     object LabelYM: TLabel
@@ -25,16 +25,37 @@ object frameYMList: TframeYMList
       ParentFont = False
     end
     object Label11: TLabel
-      Left = 40
+      Left = 80
-      Top = 10
+      Top = 36
       Width = 72
       Height = 13
       Caption = #36827#20986#26009'(m/min)'
     end
+    object Label1: TLabel
+      Left = 80
+      Top = 71
+      Width = 72
+      Height = 13
+      Caption = #36827#20986#26009'(m/min)'
+    end
+    object Label2: TLabel
+      Left = 40
+      Top = 22
+      Width = 60
+      Height = 13
+      Caption = #21333#25490#38024#36711#27611
+    end
+    object Label3: TLabel
+      Left = 40
+      Top = 55
+      Width = 60
+      Height = 13
+      Caption = #21452#25490#38024#36711#27611
+    end
     object zm_inout: TcxTextEdit
       Tag = 2
-      Left = 124
+      Left = 164
-      Top = 7
+      Top = 33
       Style.LookAndFeel.SkinName = 'WXI'
       StyleDisabled.LookAndFeel.SkinName = 'WXI'
       StyleFocused.LookAndFeel.SkinName = 'WXI'
@@ -44,8 +65,8 @@ object frameYMList: TframeYMList
     end
     object zm_style: TcxComboBox
       Tag = 2
-      Left = 4
+      Left = 608
-      Top = 31
+      Top = 6
       Properties.Items.Strings = (
         ''
         #21333#25490#38024
@@ -55,17 +76,18 @@ object frameYMList: TframeYMList
       StyleFocused.LookAndFeel.SkinName = 'WXI'
       StyleHot.LookAndFeel.SkinName = 'WXI'
       TabOrder = 1
+      Visible = False
       Width = 82
     end
     object cxLabel336: TcxLabel
-      Left = 117
+      Left = 220
-      Top = 31
+      Top = 34
       Caption = #20027#30005#26426'('#27425'/min)'
     end
     object zm_mainElec: TcxTextEdit
       Tag = 2
-      Left = 211
+      Left = 314
-      Top = 31
+      Top = 34
       Style.LookAndFeel.SkinName = 'WXI'
       StyleDisabled.LookAndFeel.SkinName = 'WXI'
       StyleFocused.LookAndFeel.SkinName = 'WXI'
@@ -74,14 +96,14 @@ object frameYMList: TframeYMList
       Width = 50
     end
     object cxLabel344: TcxLabel
-      Left = 295
+      Left = 398
-      Top = 31
+      Top = 34
       Caption = #38024#26495#39640#24230'(cm)'
     end
     object zm_needleHigh: TcxTextEdit
       Tag = 2
-      Left = 375
+      Left = 478
-      Top = 31
+      Top = 34
       Style.LookAndFeel.SkinName = 'WXI'
       StyleDisabled.LookAndFeel.SkinName = 'WXI'
       StyleFocused.LookAndFeel.SkinName = 'WXI'
@@ -91,17 +113,60 @@ object frameYMList: TframeYMList
     end
     object cxLabel342: TcxLabel
       Left = 534
-      Top = 20
+      Top = 48
       Caption = #22791#27880
     end
     object zm_Precautions: TcxMemo
       Tag = 2
       Left = 568
-      Top = 5
+      Top = 33
       Properties.ScrollBars = ssVertical
       TabOrder = 7
       Height = 50
-      Width = 140
+      Width = 194
+    end
+    object zm_inout2: TcxTextEdit
+      Tag = 2
+      Left = 164
+      Top = 66
+      Style.LookAndFeel.SkinName = 'WXI'
+      StyleDisabled.LookAndFeel.SkinName = 'WXI'
+      StyleFocused.LookAndFeel.SkinName = 'WXI'
+      StyleHot.LookAndFeel.SkinName = 'WXI'
+      TabOrder = 8
+      Width = 50
+    end
+    object cxLabel1: TcxLabel
+      Left = 220
+      Top = 68
+      Caption = #20027#30005#26426'('#27425'/min)'
+    end
+    object zm_mainElec2: TcxTextEdit
+      Tag = 2
+      Left = 314
+      Top = 68
+      Style.LookAndFeel.SkinName = 'WXI'
+      StyleDisabled.LookAndFeel.SkinName = 'WXI'
+      StyleFocused.LookAndFeel.SkinName = 'WXI'
+      StyleHot.LookAndFeel.SkinName = 'WXI'
+      TabOrder = 10
+      Width = 50
+    end
+    object cxLabel2: TcxLabel
+      Left = 398
+      Top = 67
+      Caption = #38024#26495#39640#24230'(cm)'
+    end
+    object zm_needleHigh2: TcxTextEdit
+      Tag = 2
+      Left = 478
+      Top = 67
+      Style.LookAndFeel.SkinName = 'WXI'
+      StyleDisabled.LookAndFeel.SkinName = 'WXI'
+      StyleFocused.LookAndFeel.SkinName = 'WXI'
+      StyleHot.LookAndFeel.SkinName = 'WXI'
+      TabOrder = 12
+      Width = 50
     end
   end
   object ADOQueryMain: TADOQuery

F02染色计划单/U_frameYMList.pas

@@ -37,6 +37,14 @@ type
     zm_needleHigh: TcxTextEdit;
     cxLabel342: TcxLabel;
     zm_Precautions: TcxMemo;
+    Label1: TLabel;
+    zm_inout2: TcxTextEdit;
+    cxLabel1: TcxLabel;
+    zm_mainElec2: TcxTextEdit;
+    cxLabel2: TcxLabel;
+    zm_needleHigh2: TcxTextEdit;
+    Label2: TLabel;
+    Label3: TLabel;
     procedure TBRafreshClick(Sender: TObject);
 
     procedure ToolButton5Click(Sender: TObject);

F04染色刷卡/DyeProcess.dproj.local

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.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.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.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.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.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.620,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_MachTaskList.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.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas</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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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>
     <Transaction>2025/11/11 15:05:18.000.149,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas</Transaction>
-    <Transaction>2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.dfm</Transaction>
+    <Transaction>2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.dfm</Transaction>
-    <Transaction>2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.pas</Transaction>
+    <Transaction>2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F04染色刷卡/U_DyePCDetailsList.dfm

@@ -171,7 +171,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Caption = #35774#22791
     end
     object Label5: TLabel
-      Left = 982
+      Left = 1037
       Top = 6
       Width = 24
       Height = 13
@@ -184,7 +184,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       ParentFont = False
     end
     object Label6: TLabel
-      Left = 856
+      Left = 911
       Top = 6
       Width = 24
       Height = 13
@@ -222,90 +222,90 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBDX3: TSpeedButton
       Tag = 5
-      Left = 607
+      Left = 721
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #23450#22411'3'
       OnClick = SBCCQX1Click
     end
     object SBDX2: TSpeedButton
       Tag = 4
-      Left = 553
+      Left = 667
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #23450#22411'2'
       OnClick = SBCCQX1Click
     end
     object SBDX1: TSpeedButton
       Tag = 3
-      Left = 499
+      Left = 613
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #23450#22411'1'
       OnClick = SBCCQX1Click
     end
     object SBJG1: TSpeedButton
       Tag = 8
-      Left = 392
+      Left = 506
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #26426#32568'1'
       OnClick = SBCCQX1Click
     end
     object SBDX6: TSpeedButton
       Tag = 8
-      Left = 769
+      Left = 883
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #23450#22411'6'
       OnClick = SBCCQX1Click
     end
     object SBDX5: TSpeedButton
       Tag = 7
-      Left = 715
+      Left = 829
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #23450#22411'5'
       OnClick = SBCCQX1Click
     end
     object SBDX4: TSpeedButton
       Tag = 6
-      Left = 661
+      Left = 775
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #23450#22411'4'
       OnClick = SBCCQX1Click
     end
     object SBJRG1: TSpeedButton
       Tag = 10
-      Left = 230
+      Left = 344
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #21367#26579#32568'1'
       OnClick = SBCCQX1Click
     end
     object SBJRG3: TSpeedButton
       Tag = 12
-      Left = 338
+      Left = 452
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #21367#26579#32568'3'
       OnClick = SBCCQX1Click
@@ -315,7 +315,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Left = 14
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Down = True
       Caption = #36711#27611'1'
@@ -323,10 +323,10 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBJRG2: TSpeedButton
       Tag = 11
-      Left = 284
+      Left = 398
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #21367#26579#32568'2'
       OnClick = SBCCQX1Click
@@ -336,7 +336,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Left = 68
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #36711#27611'2'
       OnClick = SBCCQX1Click
@@ -353,14 +353,34 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBPD1: TSpeedButton
       Tag = 15
-      Left = 445
+      Left = 559
       Top = 69
       Width = 50
-      Height = 22
+      Height = 20
       GroupIndex = 1
       Caption = #25293#25171'1'
       OnClick = SBCCQX1Click
     end
+    object SBTK1: TSpeedButton
+      Tag = 16
+      Left = 234
+      Top = 69
+      Width = 50
+      Height = 20
+      GroupIndex = 1
+      Caption = #25512#26694'1'
+      OnClick = SBCCQX1Click
+    end
+    object SBTK2: TSpeedButton
+      Tag = 17
+      Left = 288
+      Top = 69
+      Width = 50
+      Height = 20
+      GroupIndex = 1
+      Caption = #25512#26694'2'
+      OnClick = SBCCQX1Click
+    end
     object pcid: TEdit
       Tag = 2
       Left = 314
@@ -455,7 +475,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Visible = False
     end
     object cbALL_temperature6: TCheckBox
-      Left = 1022
+      Left = 1077
       Top = 6
       Width = 65
       Height = 17
@@ -464,7 +484,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnClick = cbALL_temperature6Click
     end
     object cbAll_zhuji: TCheckBox
-      Left = 1022
+      Left = 1077
       Top = 29
       Width = 65
       Height = 17
@@ -489,7 +509,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Width = 121
     end
     object cbTime: TCheckBox
-      Left = 1022
+      Left = 1077
       Top = 54
       Width = 65
       Height = 17
@@ -516,7 +536,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnKeyPress = pcidKeyPress
     end
     object cbPC0: TCheckBox
-      Left = 896
+      Left = 951
       Top = 6
       Width = 65
       Height = 17
@@ -529,7 +549,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnClick = cbPC0Click
     end
     object cbPC1: TCheckBox
-      Left = 896
+      Left = 951
       Top = 29
       Width = 65
       Height = 17
@@ -542,7 +562,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnClick = cbPC0Click
     end
     object cbBG: TCheckBox
-      Left = 896
+      Left = 951
       Top = 77
       Width = 65
       Height = 17
@@ -555,7 +575,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnClick = cbPC0Click
     end
     object cbSC: TCheckBox
-      Left = 896
+      Left = 951
       Top = 52
       Width = 65
       Height = 17
@@ -568,7 +588,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnClick = cbPC0Click
     end
     object Panel4: TPanel
-      Left = 1111
+      Left = 1166
       Top = 9
       Width = 60
       Height = 25
@@ -584,7 +604,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       TabOrder = 20
     end
     object Panel5: TPanel
-      Left = 1177
+      Left = 1232
       Top = 9
       Width = 60
       Height = 25
@@ -594,7 +614,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       TabOrder = 21
     end
     object Panel6: TPanel
-      Left = 1111
+      Left = 1166
       Top = 40
       Width = 60
       Height = 25
@@ -604,7 +624,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       TabOrder = 22
     end
     object Panel7: TPanel
-      Left = 1177
+      Left = 1232
       Top = 40
       Width = 60
       Height = 25
@@ -614,7 +634,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       TabOrder = 23
     end
     object cbGlideName: TCheckBox
-      Left = 1022
+      Left = 1077
       Top = 77
       Width = 65
       Height = 17
@@ -655,6 +675,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Align = alLeft
       PopupMenu = PM_1
       TabOrder = 0
+      ExplicitTop = 6
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
@@ -993,7 +1014,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
   end
   object DS_1: TDataSource
     DataSet = CDS_1
-    Left = 336
+    Left = 312
     Top = 184
   end
   object GPM1: TcxGridPopupMenu
@@ -1005,8 +1026,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
   object CDS_1: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 384
+    Left = 400
-    Top = 176
+    Top = 184
   end
   object RMGridReport1: TRMGridReport
     ThreadPrepareReport = True

F04染色刷卡/U_DyePCDetailsList.pas

@@ -137,6 +137,8 @@ type
     ToolButton2: TToolButton;
     cbGlideName: TCheckBox;
     Tv2MCNo: TcxGridDBColumn;
+    SBTK1: TSpeedButton;
+    SBTK2: TSpeedButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -733,6 +735,18 @@ begin
           MCName.Text := 'PD1';
           InitGrid1();
         end;
+      16:
+        begin
+          MCNO.Text := '推框机1';
+          MCName.Text := 'TK1';
+          InitGrid1();
+        end;
+      17:
+        begin
+          MCNO.Text := '推框机2';
+          MCName.Text := 'TK2';
+          InitGrid1();
+        end;
     end;
   end;
 
@@ -949,6 +963,28 @@ var
   mGlideID1, mGlideID2: string;
   mConflict: Integer;
 begin
+  if CDS_1.IsEmpty then
+  begin
+    Exit;
+  end;
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    SQL.Add(' select A.* from V_Dye_Cloth_PaiGang A ');
+    SQL.Add(' where A.PCID = ' + QuotedStr(Trim(CDS_2.FieldByName('PCID').AsString)) );
+    sql.Add(' and A.GlideNo = ' + CDS_2.FieldByName('GlideNo').AsString );
+    sql.Add(' and (A.KaZuState = 10 ');
+    sql.Add(' or (SELECT COUNT(*) FROM Dye_Plan_Glide_OutPut X WHERE X.PCID = A.PCID AND X.GlideNo = A.GlideNo)>1) ');
+//    ShowMessage(sql.Text);
+    Open;
+  end;
+  if not ADOQueryCmd.IsEmpty then
+  begin
+    Application.MessageBox('已完成或已下机工序不能取消！','提示信息',MB_OK);
+    Exit;
+  end;
+
   if MessageDlg('确定取消？此操作无法撤销！', mtWarning, [mbOK, mbCancel], 0) = mrOK then
   begin
   // 开始事务
@@ -1245,6 +1281,7 @@ begin
       sql.Clear;
       SQL.Add(' select A.* from V_Dye_Cloth_PaiGang A where 1=1  ');
       sql.Add(' AND  A.KaZuState = 9 ');
+      sql.Add(' and (SELECT COUNT(*) FROM Dye_Plan_Glide_OutPut X WHERE X.PCID = A.PCID AND X.GlideNo = A.GlideNo)<2 ');
       if msql1 <> '' then
       begin
         sql.Add(' and ( ' + msql1 + ' )');

F04染色刷卡/U_DyePCList.dfm

@@ -260,6 +260,7 @@ inherited frmDyePCList: TfrmDyePCList
     TabOrder = 3
     LookAndFeel.ScrollbarMode = sbmHybrid
     LookAndFeel.ScrollMode = scmDefault
+    ExplicitTop = 98
     object tv1: TcxGridDBTableView
       Tag = 9999
       DragMode = dmAutomatic
@@ -299,100 +300,72 @@ inherited frmDyePCList: TfrmDyePCList
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
-        Width = 72
+        Width = 87
+      end
+      object tv1ZM1: TcxGridDBColumn
+        Caption = #36711#27611#26426'1'
+        DataBinding.FieldName = 'ZM1'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1ZM1StylesGetContentStyle
+        Width = 88
+        OnCompareRowValuesForCellMerging = tv1ZM1CompareRowValuesForCellMerging
+      end
+      object tv1ZM2: TcxGridDBColumn
+        Caption = #36711#27611#26426'2'
+        DataBinding.FieldName = 'ZM2'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1ZM2StylesGetContentStyle
+        Width = 94
+        OnCompareRowValuesForCellMerging = tv1ZM2CompareRowValuesForCellMerging
       end
       object tv1CCQX1: TcxGridDBColumn
         Tag = 99
-        Caption = #38271#36710#28165#27927#26426
+        Caption = #38271#36710#28165#27927#26426'1'
         DataBinding.FieldName = 'CCQX1'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Options.CellMerging = True
         Styles.OnGetContentStyle = tv1CCQX1StylesGetContentStyle
-        Width = 88
+        Width = 98
         OnCompareRowValuesForCellMerging = tv1CCQX1CompareRowValuesForCellMerging
       end
-      object tv1DX1: TcxGridDBColumn
+      object tv1CCQX2: TcxGridDBColumn
-        Caption = #23450#22411#26426#19968#21495#26426
+        Caption = #38271#36710#28165#27927#26426'2'
-        DataBinding.FieldName = 'DX1'
+        DataBinding.FieldName = 'CCQX2'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.CellMerging = True
+        Options.Editing = False
-        Styles.OnGetContentStyle = tv1DX1StylesGetContentStyle
+        Width = 122
-        Width = 101
-        OnCompareRowValuesForCellMerging = tv1DX1CompareRowValuesForCellMerging
       end
-      object tv1DX2: TcxGridDBColumn
+      object tv1TK1: TcxGridDBColumn
-        Caption = #23450#22411#26426#20108#21495#26426
+        Caption = #25512#26694#26426'1'
-        DataBinding.FieldName = 'DX2'
+        DataBinding.FieldName = 'TK1'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.FilteringPopupIncrementalFiltering = True
+        Options.Editing = False
-        Options.CellMerging = True
+        Width = 80
-        Styles.OnGetContentStyle = tv1DX2StylesGetContentStyle
-        Width = 93
-        OnCompareRowValuesForCellMerging = tv1DX2CompareRowValuesForCellMerging
       end
-      object tv1DX3: TcxGridDBColumn
+      object tv1TK2: TcxGridDBColumn
-        Caption = #23450#22411#26426#19977#21495#26426
+        Caption = #25512#26694#26426'2'
-        DataBinding.FieldName = 'DX3'
+        DataBinding.FieldName = 'TK2'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.FilteringPopupIncrementalFiltering = True
+        Options.Editing = False
-        Options.CellMerging = True
+        Width = 80
-        Styles.OnGetContentStyle = tv1DX3StylesGetContentStyle
-        Width = 94
-        OnCompareRowValuesForCellMerging = tv1DX3CompareRowValuesForCellMerging
-      end
-      object tv1DX4: TcxGridDBColumn
-        Caption = #23450#22411#26426#22235#21495#26426
-        DataBinding.FieldName = 'DX4'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.FilteringPopupIncrementalFiltering = True
-        Options.CellMerging = True
-        Styles.OnGetContentStyle = tv1DX4StylesGetContentStyle
-        Width = 89
-        OnCompareRowValuesForCellMerging = tv1DX4CompareRowValuesForCellMerging
-      end
-      object tv1DX5: TcxGridDBColumn
-        Caption = #23450#22411#26426#20116#21495#26426
-        DataBinding.FieldName = 'DX5'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.FilteringPopupIncrementalFiltering = True
-        Options.CellMerging = True
-        Styles.OnGetContentStyle = tv1DX5StylesGetContentStyle
-        Width = 83
-        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 = 81
-        OnCompareRowValuesForCellMerging = tv1DX6CompareRowValuesForCellMerging
-      end
-      object tv1JG1: TcxGridDBColumn
-        Caption = #26426#32568
-        DataBinding.FieldName = 'JG1'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.FilteringPopupIncrementalFiltering = True
-        Options.CellMerging = True
-        Styles.OnGetContentStyle = tv1JG1StylesGetContentStyle
-        Width = 81
-        OnCompareRowValuesForCellMerging = tv1JG1CompareRowValuesForCellMerging
       end
       object tv1JRG1: TcxGridDBColumn
         Caption = #21367#26579#32568'1'
         DataBinding.FieldName = 'JRG1'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Options.FilteringPopupIncrementalFiltering = True
         Options.CellMerging = True
         Styles.OnGetContentStyle = tv1JRG1StylesGetContentStyle
@@ -404,6 +377,7 @@ inherited frmDyePCList: TfrmDyePCList
         DataBinding.FieldName = 'JRG2'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Options.FilteringPopupIncrementalFiltering = True
         Options.CellMerging = True
         Styles.OnGetContentStyle = tv1JRG2StylesGetContentStyle
@@ -415,11 +389,105 @@ inherited frmDyePCList: TfrmDyePCList
         DataBinding.FieldName = 'JRG3'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Options.CellMerging = True
         Styles.OnGetContentStyle = tv1JRG3StylesGetContentStyle
         Width = 81
         OnCompareRowValuesForCellMerging = tv1JRG3CompareRowValuesForCellMerging
       end
+      object tv1JG1: TcxGridDBColumn
+        Caption = #26426#32568'1'
+        DataBinding.FieldName = 'JG1'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1JG1StylesGetContentStyle
+        Width = 81
+        OnCompareRowValuesForCellMerging = tv1JG1CompareRowValuesForCellMerging
+      end
+      object tv1PD1: TcxGridDBColumn
+        Caption = #25293#25171#26426'1'
+        DataBinding.FieldName = 'PD1'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Styles.OnGetContentStyle = tv1PD1StylesGetContentStyle
+        Width = 80
+        OnCompareRowValuesForCellMerging = tv1PD1CompareRowValuesForCellMerging
+      end
+      object tv1DX1: TcxGridDBColumn
+        Caption = #23450#22411#26426'1'
+        DataBinding.FieldName = 'DX1'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX1StylesGetContentStyle
+        Width = 101
+        OnCompareRowValuesForCellMerging = tv1DX1CompareRowValuesForCellMerging
+      end
+      object tv1DX2: TcxGridDBColumn
+        Caption = #23450#22411#26426'2'
+        DataBinding.FieldName = 'DX2'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX2StylesGetContentStyle
+        Width = 93
+        OnCompareRowValuesForCellMerging = tv1DX2CompareRowValuesForCellMerging
+      end
+      object tv1DX3: TcxGridDBColumn
+        Caption = #23450#22411#26426'3'
+        DataBinding.FieldName = 'DX3'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX3StylesGetContentStyle
+        Width = 94
+        OnCompareRowValuesForCellMerging = tv1DX3CompareRowValuesForCellMerging
+      end
+      object tv1DX4: TcxGridDBColumn
+        Caption = #23450#22411#26426'4'
+        DataBinding.FieldName = 'DX4'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX4StylesGetContentStyle
+        Width = 89
+        OnCompareRowValuesForCellMerging = tv1DX4CompareRowValuesForCellMerging
+      end
+      object tv1DX5: TcxGridDBColumn
+        Caption = #23450#22411#26426'5'
+        DataBinding.FieldName = 'DX5'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX5StylesGetContentStyle
+        Width = 83
+        OnCompareRowValuesForCellMerging = tv1DX5CompareRowValuesForCellMerging
+      end
+      object tv1DX6: TcxGridDBColumn
+        Caption = #23450#22411#26426'6'
+        DataBinding.FieldName = 'DX6'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Options.FilteringPopupIncrementalFiltering = True
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1DX6StylesGetContentStyle
+        Width = 81
+        OnCompareRowValuesForCellMerging = tv1DX6CompareRowValuesForCellMerging
+      end
       object tv1GC_BatchNo: TcxGridDBColumn
         Caption = #22383#24067#25209#27425
         DataBinding.FieldName = 'GC_BatchNo'
@@ -457,35 +525,6 @@ inherited frmDyePCList: TfrmDyePCList
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
-      object tv1ZM1: TcxGridDBColumn
-        Caption = #36711#27611#26426'1'
-        DataBinding.FieldName = 'ZM1'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.CellMerging = True
-        Styles.OnGetContentStyle = tv1ZM1StylesGetContentStyle
-        Width = 61
-        OnCompareRowValuesForCellMerging = tv1ZM1CompareRowValuesForCellMerging
-      end
-      object tv1ZM2: TcxGridDBColumn
-        Caption = #36711#27611#26426'2'
-        DataBinding.FieldName = 'ZM2'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.CellMerging = True
-        Styles.OnGetContentStyle = tv1ZM2StylesGetContentStyle
-        Width = 60
-        OnCompareRowValuesForCellMerging = tv1ZM2CompareRowValuesForCellMerging
-      end
-      object tv1PD1: TcxGridDBColumn
-        Caption = #25293#25171#26426'1'
-        DataBinding.FieldName = 'PD1'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Styles.OnGetContentStyle = tv1PD1StylesGetContentStyle
-        Width = 80
-        OnCompareRowValuesForCellMerging = tv1PD1CompareRowValuesForCellMerging
-      end
     end
     object dbGrid1Level1: TcxGridLevel
       GridView = tv1

F04染色刷卡/U_DyePCList.pas

@@ -73,6 +73,9 @@ type
     tv1ZM2: TcxGridDBColumn;
     TbUpdateTime: TToolButton;
     tv1PD1: TcxGridDBColumn;
+    tv1TK1: TcxGridDBColumn;
+    tv1TK2: TcxGridDBColumn;
+    tv1CCQX2: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);

F04染色刷卡/U_MachTaskList.pas

@@ -128,8 +128,7 @@ begin
   cxgrid1.Align := alClient;
 end;
 
-procedure TfrmMachTaskList.FormKeyDown(Sender: TObject; var Key: Word;
+procedure TfrmMachTaskList.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-  Shift: TShiftState);
 begin
   if Key = VK_ESCAPE then  // VK_ESCAPE ÊÇ ESC ¼üµÄ³£Á¿
   begin
@@ -926,6 +925,7 @@ begin
       sql.Clear;
       SQL.Add(' select A.* from V_Dye_Cloth_PaiGang A where 1=1  ');
       sql.Add(' AND  A.KaZuState = 9 ');
+      sql.Add(' and (SELECT COUNT(*) FROM Dye_Plan_Glide_OutPut X WHERE X.PCID = A.PCID AND X.GlideNo = A.GlideNo)<2 ');
 //      sql.Add('where isComplete <> 1 OR isComplete IS NULL order by PCID ASC, GlideNo ASC');
 //      ShowMessage(SQL.Text);
 //      a.taskDate,