12.11

2025-12-11 17:31:21 +08:00 · 2025-12-11 17:31:21 +08:00 · 484cd28a34
commit 484cd28a34
parent b7a606e38c
38 changed files with 607 additions and 349 deletions
--- a/A02基础产品管理/ClothInfo.dproj.local
+++ b/A02基础产品管理/ClothInfo.dproj.local
@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm</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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.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.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.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.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm</Transaction>
+    <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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.217,=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.936,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A02基础产品管理\U_ClothInfoInput.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.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm</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.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.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_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm</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.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj</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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10sxYilanbuyi"/>
--- a/A02基础产品管理/U_ClothInfo.dfm
+++ b/A02基础产品管理/U_ClothInfo.dfm
@ -7,6 +7,7 @@ inherited frmClothInfo: TfrmClothInfo
  FormStyle = fsMDIChild
  Position = poScreenCenter
  Visible = True
  OnKeyDown = FormKeyDown
  ExplicitWidth = 1472
  ExplicitHeight = 741
  PixelsPerInch = 96
@ -359,8 +360,6 @@ inherited frmClothInfo: TfrmClothInfo
      Align = alClient
      PopupMenu = PM_1
      TabOrder = 0
      ExplicitLeft = 6
      ExplicitTop = 59
      object Tv1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        Navigator.Buttons.Delete.Enabled = False
--- a/A02基础产品管理/U_ClothInfo.pas
+++ b/A02基础产品管理/U_ClothInfo.pas
@ -183,6 +183,7 @@ type
    procedure TbCheckClick(Sender: TObject);
    procedure TbUndoCheckClick(Sender: TObject);
    procedure cxTabControl1Change(Sender: TObject);
    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
    { Private declarations }
    CurrentPage, RecordsNumber: Integer;
@ -417,6 +418,16 @@ begin
 //  cxTabControl1.TabIndex := 0;
 end;
 procedure TfrmClothInfo.FormKeyDown(Sender: TObject; var Key: Word;
  Shift: TShiftState);
 begin
  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
  begin
    Key := 0;  // 清除按键，防止继续传递
    Close;     // 或者 ModalResult := mrCancel;
  end;
 end;
 procedure TfrmClothInfo.TBCloseClick(Sender: TObject);
 begin
@ -484,6 +495,8 @@ begin
  SetStatus();
  InitGrid();
  KeyPreview := True;
 end;
 procedure TfrmClothInfo.cbbHXChange(Sender: TObject);
--- a/A02基础产品管理/U_ClothInfoInput.dfm
+++ b/A02基础产品管理/U_ClothInfoInput.dfm
@ -12,6 +12,7 @@ object frmClothInfoInput: TfrmClothInfoInput
  Font.Style = []
  OldCreateOrder = True
  Position = poScreenCenter
  OnKeyDown = FormKeyDown
  OnShow = FormShow
  PixelsPerInch = 96
  TextHeight = 12
--- a/A02基础产品管理/U_ClothInfoInput.pas
+++ b/A02基础产品管理/U_ClothInfoInput.pas
@ -775,6 +775,7 @@ type
    procedure TV4CellDblClick(Sender: TcxCustomGridTableView;
      ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
      AShift: TShiftState; var AHandled: Boolean);
    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
    canshu1: string;
@ -965,6 +966,16 @@ begin
 end;
 procedure TfrmClothInfoInput.FormKeyDown(Sender: TObject; var Key: Word;
  Shift: TShiftState);
 begin
  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
  begin
    Key := 0;  // 清除按键，防止继续传递
    Close;     // 或者 ModalResult := mrCancel;
  end;
 end;
 procedure TfrmClothInfoInput.FormShow(Sender: TObject);
 var
  MaxBCIID, TechnicsID, MaxBCPID: string;
@ -1058,6 +1069,8 @@ begin
    TbDelete.Enabled := False;
  end;
  KeyPreview := True;
 end;
 //procedure TfrmClothInfoInput.fs_meterPropertiesChange(Sender: TObject);
--- a/A02基础产品管理/U_ClothType.dfm
+++ b/A02基础产品管理/U_ClothType.dfm
@ -6,6 +6,7 @@ inherited frmClothType: TfrmClothType
  ClientWidth = 981
  FormStyle = fsMDIChild
  Visible = True
  OnKeyDown = FormKeyDown
  ExplicitWidth = 997
  ExplicitHeight = 568
  PixelsPerInch = 96
--- a/A02基础产品管理/U_ClothType.pas
+++ b/A02基础产品管理/U_ClothType.pas
@ -43,6 +43,7 @@ type
    procedure CTNameKeyPress(Sender: TObject; var Key: Char);
    procedure FormShow(Sender: TObject);
    procedure FormCreate(Sender: TObject);
    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
    { Private declarations }
    PState: Integer;
@ -90,6 +91,16 @@ begin
  frmClothType := nil;
 end;
 procedure TfrmClothType.FormKeyDown(Sender: TObject; var Key: Word;
  Shift: TShiftState);
 begin
  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
  begin
    Key := 0;  // 清除按键，防止继续传递
    Close;     // 或者 ModalResult := mrCancel;
  end;
 end;
 procedure TfrmClothType.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
  inherited;
@ -257,6 +268,8 @@ procedure TfrmClothType.FormShow(Sender: TObject);
 begin
  inherited;
  InitTree();
  KeyPreview := True;
 end;
 end.
--- a/A02基础产品管理/U_ClothTypeSel.dfm
+++ b/A02基础产品管理/U_ClothTypeSel.dfm
@ -13,6 +13,7 @@ object frmClothTypeSel: TfrmClothTypeSel
  OldCreateOrder = False
  Position = poScreenCenter
  OnCreate = FormCreate
  OnKeyDown = FormKeyDown
  OnShow = FormShow
  PixelsPerInch = 96
  TextHeight = 12
@ -35,6 +36,7 @@ object frmClothTypeSel: TfrmClothTypeSel
    OptionsView.CellAutoHeight = True
    OptionsView.Headers = False
    RootValue = -1
    ScrollbarAnnotations.CustomAnnotations = <>
    TabOrder = 0
    OnDblClick = cxDBTreeList1DblClick
    object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn
--- a/A02基础产品管理/U_ClothTypeSel.pas
+++ b/A02基础产品管理/U_ClothTypeSel.pas
@ -7,7 +7,7 @@ uses
  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit,
  cxInplaceContainer, cxDBTL, cxControls, cxTLData, DB, ADODB, cxLookAndFeels,
  cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxSkinsCore,
-  dxSkinsDefaultPainters;
+  dxSkinsDefaultPainters, cxFilter, dxScrollbarAnnotations;
 type
  TfrmClothTypeSel = class(TForm)
@ -19,6 +19,7 @@ type
    procedure FormCreate(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure cxDBTreeList1DblClick(Sender: TObject);
    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
    { Private declarations }
  public
@ -49,6 +50,16 @@ begin
  end;
 end;
 procedure TfrmClothTypeSel.FormKeyDown(Sender: TObject; var Key: Word;
  Shift: TShiftState);
 begin
  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
  begin
    Key := 0;  // 清除按键，防止继续传递
    Close;     // 或者 ModalResult := mrCancel;
  end;
 end;
 procedure TfrmClothTypeSel.FormShow(Sender: TObject);
 begin
  with ADOQueryHelp do
@ -59,6 +70,8 @@ begin
    Open;
  end;
  cxDBTreeList1.Items[0].Expand(false);
  KeyPreview := True;
 end;
 procedure TfrmClothTypeSel.cxDBTreeList1DblClick(Sender: TObject);
--- a/A02基础产品管理/U_CraftSel.dfm
+++ b/A02基础产品管理/U_CraftSel.dfm
@ -10,6 +10,7 @@ inherited frmCraftSel: TfrmCraftSel
  Font.Name = #23435#20307
  Position = poScreenCenter
  OnClose = FormClose
  OnKeyDown = FormKeyDown
  ExplicitWidth = 909
  ExplicitHeight = 597
  PixelsPerInch = 96
@ -21,7 +22,6 @@ inherited frmCraftSel: TfrmCraftSel
    Height = 476
    Align = alClient
    TabOrder = 0
    ExplicitTop = 76
    object TV1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
--- a/A02基础产品管理/U_CraftSel.pas
+++ b/A02基础产品管理/U_CraftSel.pas
@ -63,6 +63,7 @@ type
    procedure TBSaveFormatClick(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
    procedure DTMNoChange(Sender: TObject);
    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  private
    procedure InitGrid();
    { Private declarations }
@ -140,7 +141,7 @@ begin
  InitGrid();
  ReadCxGrid(self.Caption + 'TV1', TV1, '工艺信息选择');
-
+  KeyPreview := True;
 end;
 procedure TfrmCraftSel.TBCloseClick(Sender: TObject);
@ -173,5 +174,15 @@ begin
  frmCraftSel := nil;
 end;
 procedure TfrmCraftSel.FormKeyDown(Sender: TObject; var Key: Word;
  Shift: TShiftState);
 begin
  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
  begin
    Key := 0;  // 清除按键，防止继续传递
    Close;     // 或者 ModalResult := mrCancel;
  end;
 end;
 end.
--- a/A02基础产品管理/U_TatClothInfo.dfm
+++ b/A02基础产品管理/U_TatClothInfo.dfm
@ -322,6 +322,8 @@ inherited frmTatClothInfo: TfrmTatClothInfo
      Align = alClient
      PopupMenu = PM_1
      TabOrder = 0
      ExplicitLeft = -2
      ExplicitTop = 46
      object Tv1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        Navigator.Buttons.Delete.Enabled = False
--- a/F01染色坯布仓库/DyeGreyClothStk.dproj.local
+++ b/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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.865,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj</Transaction>
    <Transaction>1899/12/30 00:00:00.000.817,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.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.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.278,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.492,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
    <Transaction>2025/08/29 17:00:58.000.253,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePlanForCardSel.pas</Transaction>
    <Transaction>2025/09/29 17:18:11.000.618,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePBImport.pas</Transaction>
    <Transaction>2025/10/13 14:35:20.000.136,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyeGreyClothStkStats.pas</Transaction>
--- a/F01染色坯布仓库/DyeGreyClothStk.identcache
+++ b/F01染色坯布仓库/DyeGreyClothStk.identcache
--- a/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm
+++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm
@ -22,7 +22,6 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
    Height = 508
    Align = alClient
    TabOrder = 0
    ExplicitTop = 44
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
--- a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas
+++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas
@ -374,7 +374,7 @@ begin
  end;
  if CDS_Sub.Locate('IOType', null, []) = True then
  begin
-    Application.MessageBox('加工类型不能为空!', '提示', 0);
+    Application.MessageBox('入库类型不能为空!', '提示', 0);
    Exit;
  end;
 //  if CDS_Sub.Locate('C_XINHAO', null, []) = True then
--- a/F01染色坯布仓库/U_DyeGreyClothInList.dfm
+++ b/F01染色坯布仓库/U_DyeGreyClothInList.dfm
@ -115,6 +115,7 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
    ExplicitTop = 32
    object Label1: TLabel
      Left = 28
      Top = 12
@ -213,13 +214,11 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
      TabOrder = 5
      OnChange = IOTypeChange
      Items.Strings = (
        ''
        #21152#24037#20837#24211
        #22238#20462#20837#24211
-        #36820#20462#20837#24211
+        #26679#24067
-        #25171#26679#20837#24211
+        #26679#24067#22238#20462)
        #22238#20179
        #26679#22238#20837#24211
        #26679#36820#20837#24211)
    end
  end
  object cxGrid2: TcxGrid [2]
--- a/F02染色计划单/DyePlan.dproj.local
+++ b/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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.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.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.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.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.383,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_CraftSel.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.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.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.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.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>
--- a/F02染色计划单/DyePlan.identcache
+++ b/F02染色计划单/DyePlan.identcache
--- a/F02染色计划单/SpliterPosition.INI
+++ b/F02染色计划单/SpliterPosition.INI
@ -0,0 +1,6 @@
 [DyeSimpleTechnicsList_Spliter]
 Position1=902
 Position2=1230
 [DyeTechnicsList_Spliter]
 Position=1219
--- a/F02染色计划单/U_DyePlanCardInput.dfm
+++ b/F02染色计划单/U_DyePlanCardInput.dfm
@ -61,6 +61,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
            Color = clWhite
            ParentBackground = False
            TabOrder = 0
            ExplicitTop = 269
            object Label1: TLabel
              Left = 43
              Top = 16
@ -238,15 +239,16 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
          end
          object pnlOrder: TPanel
            Left = 0
-            Top = 208
+            Top = 174
            Width = 1444
-            Height = 63
+            Height = 97
            Align = alBottom
            BevelInner = bvRaised
            BevelOuter = bvLowered
            Color = clWhite
            ParentBackground = False
            TabOrder = 1
            ExplicitLeft = -1
            object Label23: TLabel
              Left = 43
              Top = 11
@ -298,6 +300,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              Font.Name = #23435#20307
              Font.Style = [fsBold]
              ParentFont = False
              Visible = False
            end
            object Label10: TLabel
              Left = 560
@ -324,6 +327,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              Font.Name = #23435#20307
              Font.Style = [fsBold]
              ParentFont = False
              Visible = False
            end
            object Label2: TLabel
              Left = 1090
@ -337,6 +341,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              Font.Name = #23435#20307
              Font.Style = [fsBold]
              ParentFont = False
              Visible = False
            end
            object Label3: TLabel
              Left = 249
@ -365,8 +370,8 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              ParentFont = False
            end
            object Label6: TLabel
-              Left = 1073
+              Left = 1249
-              Top = 41
+              Top = 10
              Width = 52
              Height = 12
              Caption = #24037#33402#20027#38190
@ -379,8 +384,8 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              Visible = False
            end
            object Label8: TLabel
-              Left = 723
+              Left = 43
-              Top = 42
+              Top = 74
              Width = 52
              Height = 12
              Caption = #20135#21697#22791#27880
@ -462,6 +467,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              Font.Style = []
              ParentFont = False
              TabOrder = 3
              Visible = False
            end
            object OrdQty: TEdit
              Tag = 2
@ -477,6 +483,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              Font.Style = []
              ParentFont = False
              TabOrder = 4
              Visible = False
            end
            object OrdUnit: TEdit
              Tag = 2
@ -492,6 +499,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              Font.Style = []
              ParentFont = False
              TabOrder = 5
              Visible = False
            end
            object OrdPiece: TEdit
              Tag = 2
@ -507,11 +515,12 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
              Font.Style = []
              ParentFont = False
              TabOrder = 6
              Visible = False
            end
            object DTMPSlist: TBtnEditA
              Left = 307
              Top = 37
-              Width = 400
+              Width = 414
              Height = 20
              Font.Charset = GB2312_CHARSET
              Font.Color = clBlue
@ -539,8 +548,8 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
            end
            object DTMID: TEdit
              Tag = 2
-              Left = 1132
+              Left = 1308
-              Top = 37
+              Top = 6
              Width = 100
              Height = 20
              Font.Charset = GB2312_CHARSET
@ -554,9 +563,9 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
            end
            object CINote: TEdit
              Tag = 2
-              Left = 781
+              Left = 101
-              Top = 37
+              Top = 69
-              Width = 100
+              Width = 620
              Height = 20
              Font.Charset = GB2312_CHARSET
              Font.Color = clBlue
@ -569,8 +578,8 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
            object C_description: TEdit
              Tag = 2
              Left = 950
-              Top = 33
+              Top = 37
-              Width = 100
+              Width = 458
              Height = 20
              Font.Charset = GB2312_CHARSET
              Font.Color = clBlue
@ -600,7 +609,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
            Left = 0
            Top = 0
            Width = 1444
-            Height = 208
+            Height = 174
            Align = alClient
            Font.Charset = GB2312_CHARSET
            Font.Color = clWindowText
@ -610,6 +619,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
            ParentFont = False
            PopupMenu = PM_2
            TabOrder = 2
            ExplicitTop = 1
            object TV2: TcxGridDBTableView
              OnDblClick = TV2DblClick
              Navigator.Buttons.CustomButtons = <>
@ -1245,7 +1255,6 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
        Align = alClient
        PopupMenu = PM_1
        TabOrder = 0
        ExplicitTop = 45
        object TV1: TcxGridDBTableView
          Navigator.Buttons.CustomButtons = <>
          ScrollbarAnnotations.CustomAnnotations = <>
--- a/F02染色计划单/U_DyePlanCardList.dfm
+++ b/F02染色计划单/U_DyePlanCardList.dfm
@ -170,7 +170,6 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
    ExplicitTop = 32
    object Label1: TLabel
      Left = 23
      Top = 15
@ -185,8 +184,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      ParentFont = False
    end
    object Label3: TLabel
-      Left = 223
+      Left = 365
-      Top = 39
+      Top = 13
      Width = 52
      Height = 12
      Caption = #35745#21010#21333#21495
@ -198,8 +197,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      ParentFont = False
    end
    object Label4: TLabel
-      Left = 417
+      Left = 717
-      Top = 39
+      Top = 13
      Width = 54
      Height = 12
      Caption = #23458'    '#25143
@ -211,8 +210,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      ParentFont = False
    end
    object Label8: TLabel
-      Left = 611
+      Left = 534
-      Top = 15
+      Top = 39
      Width = 52
      Height = 12
      Caption = #20135#21697#21517#31216
@ -224,8 +223,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      ParentFont = False
    end
    object Label9: TLabel
-      Left = 418
+      Left = 363
-      Top = 15
+      Top = 39
      Width = 53
      Height = 12
      Caption = #21512' '#21516' '#21495
@ -237,7 +236,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      ParentFont = False
    end
    object Label10: TLabel
-      Left = 611
+      Left = 719
      Top = 39
      Width = 54
      Height = 12
@ -263,8 +262,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      ParentFont = False
    end
    object Label2: TLabel
-      Left = 223
+      Left = 202
-      Top = 15
+      Top = 39
      Width = 54
      Height = 12
      Caption = #21345'    '#21495
@ -276,12 +275,12 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      ParentFont = False
      OnDblClick = Label2DblClick
    end
-    object Label5: TLabel
+    object KaZulabrl: TLabel
-      Left = 807
+      Left = 202
-      Top = 15
+      Top = 13
-      Width = 26
+      Width = 53
      Height = 12
-      Caption = #33394#21495
+      Caption = #21345' '#32452' '#21495
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
@ -290,8 +289,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      ParentFont = False
    end
    object Label6: TLabel
-      Left = 807
+      Left = 894
-      Top = 39
+      Top = 13
      Width = 26
      Height = 12
      Caption = #39068#33394
@ -302,6 +301,19 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label13: TLabel
      Left = 532
      Top = 13
      Width = 54
      Height = 12
      Caption = #31867'    '#22411
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object BegDate: TDateTimePicker
      Left = 81
      Top = 11
@ -324,8 +336,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    end
    object OrderNo: TEdit
      Tag = 2
-      Left = 280
+      Left = 422
-      Top = 35
+      Top = 9
      Width = 100
      Height = 20
      TabOrder = 2
@ -333,8 +345,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    end
    object CustName: TEdit
      Tag = 2
-      Left = 477
+      Left = 777
-      Top = 35
+      Top = 9
      Width = 100
      Height = 20
      TabOrder = 3
@ -342,8 +354,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    end
    object C_Name: TEdit
      Tag = 2
-      Left = 669
+      Left = 592
-      Top = 11
+      Top = 33
      Width = 100
      Height = 20
      TabOrder = 4
@ -351,8 +363,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    end
    object ConNo: TEdit
      Tag = 2
-      Left = 477
+      Left = 422
-      Top = 11
+      Top = 33
      Width = 100
      Height = 20
      TabOrder = 5
@ -360,8 +372,8 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    end
    object C_Spec: TEdit
      Tag = 2
-      Left = 669
+      Left = 777
-      Top = 35
+      Top = 33
      Width = 100
      Height = 20
      TabOrder = 6
@ -378,17 +390,17 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    end
    object PCID: TEdit
      Tag = 2
-      Left = 280
+      Left = 259
-      Top = 11
+      Top = 33
      Width = 100
      Height = 20
      TabOrder = 8
      OnChange = OrderNoChange
    end
-    object C_ColorNo: TEdit
+    object KaZu: TEdit
      Tag = 2
-      Left = 839
+      Left = 259
-      Top = 11
+      Top = 9
      Width = 100
      Height = 20
      TabOrder = 9
@ -396,13 +408,27 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    end
    object C_Color: TEdit
      Tag = 2
-      Left = 839
+      Left = 926
-      Top = 35
+      Top = 9
      Width = 100
      Height = 20
      TabOrder = 10
      OnChange = OrderNoChange
    end
    object PCType: TComboBox
      Tag = 2
      Left = 592
      Top = 9
      Width = 100
      Height = 20
      TabOrder = 11
      OnChange = OrderNoChange
      Items.Strings = (
        ''
        #27491#24120#21345
        #26679#24067#21345
        #22806#22238#20462)
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
@ -794,14 +820,13 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
    TabOrder = 3
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
-    Properties.TabIndex = 0
+    Properties.TabIndex = 1
    Properties.Tabs.Strings = (
      #26410#23457#26680
      #24050#23457#26680
      #24050#23436#25104
      #20840#37096)
    OnChange = cxTabControl1Change
    ExplicitTop = 95
    ClientRectBottom = 22
    ClientRectRight = 1503
    ClientRectTop = 19
--- a/F02染色计划单/U_DyePlanCardList.pas
+++ b/F02染色计划单/U_DyePlanCardList.pas
@ -95,8 +95,8 @@ type
    Label2: TLabel;
    v1Column13: TcxGridDBColumn;
    v1Column14: TcxGridDBColumn;
-    C_ColorNo: TEdit;
+    KaZu: TEdit;
-    Label5: TLabel;
+    KaZulabrl: TLabel;
    C_Color: TEdit;
    Label6: TLabel;
    Tv1Column3: TcxGridDBColumn;
@ -128,6 +128,8 @@ type
    TbSimpleGY: TToolButton;
    Tv1CINote: TcxGridDBColumn;
    Tv1C_Color: TcxGridDBColumn;
    PCType: TComboBox;
    Label13: TLabel;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -905,13 +907,13 @@ begin
            close;
            sql.Clear;
            sql.Add('update  Dye_Plan_Card SET status=''10'' ');
-            sql.Add('where PCID=' + quotedstr(trim(CDS_1.fieldbyname('PCID').AsString)));
+            sql.Add('where KaZu=' + quotedstr(trim(CDS_1.fieldbyname('KaZu').AsString)));
            sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
            sql.Add(' ' + quotedstr(trim(DName)));
            sql.Add(',getdate() ');
            sql.Add(',' + quotedstr(trim(self.Caption)));
            sql.Add(',' + quotedstr(trim('流程卡完成')));
-            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('PCID').AsString))));
+            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('KaZu').AsString))));
            sql.Add(',' + quotedstr(trim('成功')));
            sql.Add(')');
            execsql;
@ -955,13 +957,13 @@ begin
            close;
            sql.Clear;
            sql.Add('update  Dye_Plan_Card SET status=''9'' ');
-            sql.Add('where PCID=' + quotedstr(trim(CDS_1.fieldbyname('PCID').AsString)));
+            sql.Add('where KaZu=' + quotedstr(trim(CDS_1.fieldbyname('KaZu').AsString)));
            sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
            sql.Add(' ' + quotedstr(trim(DName)));
            sql.Add(',getdate() ');
            sql.Add(',' + quotedstr(trim(self.Caption)));
            sql.Add(',' + quotedstr(trim('流程卡撤销完成')));
-            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('PCID').AsString))));
+            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('KaZu').AsString))));
            sql.Add(',' + quotedstr(trim('成功')));
            sql.Add(')');
            execsql;
@ -1036,13 +1038,13 @@ begin
            sql.Clear;
            sql.Add('update  Dye_Plan_Card SET status=''9'' ');
            sql.Add(' ,Chker = ' + quotedstr(trim(DName)) + ',Chktime = getdate()');
-            sql.Add('where PCID=' + quotedstr(trim(CDS_1.fieldbyname('PCID').AsString)));
+            sql.Add('where KaZu=' + quotedstr(trim(CDS_1.fieldbyname('KaZu').AsString)));
            sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
            sql.Add(' ' + quotedstr(trim(DName)));
            sql.Add(',getdate() ');
            sql.Add(',' + quotedstr(trim(self.Caption)));
            sql.Add(',' + quotedstr(trim('流程卡审核')));
-            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('PCID').AsString))));
+            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('KaZu').AsString))));
            sql.Add(',' + quotedstr(trim('成功')));
            sql.Add(')');
            execsql;
@ -1086,13 +1088,13 @@ begin
            close;
            sql.Clear;
            sql.Add('update  Dye_Plan_Card SET status=''0'' ');
-            sql.Add('where PCID=' + quotedstr(trim(CDS_1.fieldbyname('PCID').AsString)));
+            sql.Add('where KaZu=' + quotedstr(trim(CDS_1.fieldbyname('KaZu').AsString)));
            sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
            sql.Add(' ' + quotedstr(trim(DName)));
            sql.Add(',getdate() ');
            sql.Add(',' + quotedstr(trim(self.Caption)));
            sql.Add(',' + quotedstr(trim('流程卡审核')));
-            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('PCID').AsString))));
+            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('KaZu').AsString))));
            sql.Add(',' + quotedstr(trim('成功')));
            sql.Add(')');
            execsql;
--- a/F02染色计划单/U_DyeSimpleTechnicsList.dfm
+++ b/F02染色计划单/U_DyeSimpleTechnicsList.dfm
@ -9,15 +9,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
  ExplicitHeight = 884
  PixelsPerInch = 96
  TextHeight = 12
-  object Splitter1: TSplitter [0]
+  object ToolBar1: TToolBar [0]
    Left = 785
    Top = 99
    Height = 746
    ExplicitLeft = 800
    ExplicitTop = 328
    ExplicitHeight = 100
  end
  object ToolBar1: TToolBar [1]
    Tag = 1
    Left = 0
    Top = 0
@ -115,7 +107,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
      OnClick = TBCloseClick
    end
  end
-  object Panel1: TPanel [2]
+  object Panel1: TPanel [1]
    Left = 0
    Top = 38
    Width = 1540
@ -158,7 +150,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
      OnKeyPress = DTMNoKeyPress
    end
  end
-  object cxTabControl1: TcxTabControl [3]
+  object cxTabControl1: TcxTabControl [2]
    Left = 0
    Top = 76
    Width = 1540
@ -177,29 +169,20 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
    ClientRectRight = 1540
    ClientRectTop = 19
  end
-  object Panel2: TPanel [4]
+  object Panel2: TPanel [3]
    Left = 0
    Top = 99
    Width = 785
    Height = 746
    Align = alLeft
    TabOrder = 3
    object Splitter2: TSplitter
      Left = 617
      Top = 1
      Width = 2
      Height = 744
      ExplicitLeft = 700
    end
    object cxGrid2: TcxGrid
      Left = 1
      Top = 1
-      Width = 616
+      Width = 630
      Height = 744
      Align = alLeft
      TabOrder = 0
      ExplicitLeft = -2
      ExplicitTop = 6
      object Tv2: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        Navigator.Buttons.Delete.Enabled = False
@ -297,16 +280,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
      end
    end
    object Panel3: TPanel
-      Left = 619
+      Left = 635
      Top = 1
-      Width = 165
+      Width = 149
      Height = 744
      Align = alClient
      TabOrder = 1
      object cxGrid1: TcxGrid
        Left = 1
        Top = 1
-        Width = 163
+        Width = 147
        Height = 385
        Align = alTop
        TabOrder = 0
@ -335,7 +318,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
      object cxGrid9: TcxGrid
        Left = 1
        Top = 424
-        Width = 163
+        Width = 147
        Height = 319
        Align = alClient
        TabOrder = 1
@ -398,7 +381,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
        Tag = 1
        Left = 1
        Top = 386
-        Width = 163
+        Width = 147
        Height = 38
        AutoSize = True
        ButtonHeight = 38
@ -428,15 +411,31 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
        end
      end
    end
    object cxSplitter1: TcxSplitter
      Left = 631
      Top = 1
      Width = 4
      Height = 744
      AutoPosition = False
      Control = cxGrid2
    end
  end
-  object ScrollBox1: TScrollBox [5]
+  object ScrollBox1: TScrollBox [4]
-    Left = 788
+    Left = 789
    Top = 99
-    Width = 752
+    Width = 751
    Height = 746
    Align = alClient
    TabOrder = 4
  end
  object cxSplitter2: TcxSplitter [5]
    Left = 785
    Top = 99
    Width = 4
    Height = 746
    AlignSplitter = salRight
    Control = Panel2
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_DyePlan.ADOLink
    Left = 281
--- a/F02染色计划单/U_DyeSimpleTechnicsList.pas
+++ b/F02染色计划单/U_DyeSimpleTechnicsList.pas
@ -57,9 +57,7 @@ type
    v2GYName: TcxGridDBColumn;
    v2GYGX: TcxGridDBColumn;
    cxGridLevel1: TcxGridLevel;
    Splitter1: TSplitter;
    ScrollBox1: TScrollBox;
    Splitter2: TSplitter;
    Panel3: TPanel;
    cxGrid1: TcxGrid;
    Tv1: TcxGridDBTableView;
@ -82,6 +80,8 @@ type
    ToolButton6: TToolButton;
    Tv3Page: TcxGridDBColumn;
    GPM_3: TcxGridPopupMenu;
    cxSplitter2: TcxSplitter;
    cxSplitter1: TcxSplitter;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -126,6 +126,8 @@ type
    procedure ClearAllTextEditsByHint(AParent: TWinControl; const AHint: string; AExclude: TcxTextEdit = nil);
    function FindLastEditedTextEdit(AParent: TWinControl; const AHint: string): string;
    procedure SetXH();
    procedure SaveSpliterPosition();
    procedure ReadSpliterPosition();
  public
    fPSIDList: string;
    fmanage: string;
@ -170,7 +172,7 @@ begin
    end;
  end;
-   with CDS_GX do
+  with CDS_GX do
  begin
    CDS_GX.IndexFieldNames := '';
    First;
@ -256,6 +258,37 @@ begin
  end;
 end;
 procedure TfrmDyeSimpleTechnicsList.SaveSpliterPosition();
 var
  IniFile: TIniFile;
  leftPos: Integer;
 begin
  try
    IniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'SpliterPosition.INI');
    IniFile.WriteInteger('DyeSimpleTechnicsList_Spliter', 'Position1', cxSplitter1.Control.Width);
    IniFile.WriteInteger('DyeSimpleTechnicsList_Spliter', 'Position2', cxSplitter2.Control.Width);
  finally
    IniFile.Free;
  end;
 end;
 procedure TfrmDyeSimpleTechnicsList.ReadSpliterPosition();
 var
  IniFile: TIniFile;
  leftPos1: Integer;
  leftPos2: Integer;
 begin
  try
    IniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'SpliterPosition.INI');
    leftPos1 := IniFile.ReadInteger('DyeSimpleTechnicsList_Spliter', 'Position1', 616);
    leftPos2 := IniFile.ReadInteger('DyeSimpleTechnicsList_Spliter', 'Position2', 785);
    cxSplitter1.Control.Width := leftPos1;
    cxSplitter2.Control.Width := leftPos2;
  finally
    IniFile.Free;
  end;
 end;
 function TfrmDyeSimpleTechnicsList.SaveData(): Boolean;
 var
  MaxProcessID, MaxBCPID, MaxPSID, MaxDTMID, mDTMID, DTMPSlist: string;
@ -466,7 +499,6 @@ begin
      MaxDTMID := mDTMID;
    end;
    with ADOQueryCmd do
    begin
      Close;
@ -571,8 +603,6 @@ begin
      ADOQueryCmd.Next;
    end;
    with ADOQueryCmd do
    begin
      Close;
@ -593,8 +623,6 @@ begin
    //////////////产品信息表内容修改//////////////
    ADOQueryCmd.Connection.CommitTrans;
 //    FPSID := maxId;
    Result := True;
@ -1350,7 +1378,7 @@ begin
  ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, '简易工艺管理');
  ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, '简易工艺管理');
  ReadCxGrid(trim(self.Caption) + 'Tv3', Tv3, '简易工艺管理');
-
+  ReadSpliterPosition();
  SetStatus();
  InitGrid();
@ -1393,7 +1421,7 @@ begin
  WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, '简易工艺管理');
  WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, '简易工艺管理');
  WriteCxGrid(trim(self.Caption) + 'Tv3', Tv3, '简易工艺管理');
-
+  SaveSpliterPosition();
 end;
 procedure TfrmDyeSimpleTechnicsList.ToolButton4Click(Sender: TObject);
@ -1492,8 +1520,7 @@ begin
  end;
 end;
-procedure TfrmDyeSimpleTechnicsList.DTMNameKeyPress(Sender: TObject;
+procedure TfrmDyeSimpleTechnicsList.DTMNameKeyPress(Sender: TObject; var Key: Char);
  var Key: Char);
 begin
  ToolButton2.Click;
 end;
@ -1503,8 +1530,7 @@ begin
  ToolButton2.Click;
 end;
-procedure TfrmDyeSimpleTechnicsList.DTMNoKeyPress(Sender: TObject;
+procedure TfrmDyeSimpleTechnicsList.DTMNoKeyPress(Sender: TObject; var Key: Char);
  var Key: Char);
 begin
  ToolButton2.Click;
 end;
@ -1712,8 +1738,6 @@ begin
  end;
 end;
 function TfrmDyeSimpleTechnicsList.GetNextFrameTop: Integer;
 var
  i: Integer;
--- a/F02染色计划单/U_DyeTechnicsList.dfm
+++ b/F02染色计划单/U_DyeTechnicsList.dfm
@ -9,13 +9,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
  ExplicitHeight = 632
  PixelsPerInch = 96
  TextHeight = 12
-  object Splitter1: TSplitter [0]
+  object ToolBar1: TToolBar [0]
    Left = 809
    Top = 99
    Height = 494
    ExplicitLeft = 825
  end
  object ToolBar1: TToolBar [1]
    Tag = 1
    Left = 0
    Top = 0
@ -113,7 +107,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
      OnClick = TBCloseClick
    end
  end
-  object Panel1: TPanel [2]
+  object Panel1: TPanel [1]
    Left = 0
    Top = 38
    Width = 1467
@ -156,15 +150,14 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
      OnKeyPress = DTMNoKeyPress
    end
  end
-  object cxGrid2: TcxGrid [3]
+  object cxGrid2: TcxGrid [2]
    Left = 0
    Top = 99
-    Width = 809
+    Width = 848
    Height = 494
    Align = alLeft
    TabOrder = 2
-    ExplicitLeft = -3
+    ExplicitLeft = 2
    ExplicitTop = 105
    object Tv2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -206,7 +199,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
        FooterAlignmentHorz = taCenter
        HeaderAlignmentHorz = taCenter
        HeaderGlyphAlignmentHorz = taCenter
-        Width = 40
+        Width = 37
      end
      object v2GYNO: TcxGridDBColumn
        Caption = #24037#33402#32534#21495
@ -214,7 +207,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
-        Width = 156
+        Width = 161
      end
      object v2GYName: TcxGridDBColumn
        Caption = #24037#33402#21517#31216
@ -222,7 +215,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
-        Width = 243
+        Width = 218
      end
      object v2GYGX: TcxGridDBColumn
        Caption = #24037#24207
@ -233,35 +226,35 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
        HeaderGlyphAlignmentHorz = taCenter
        Options.Editing = False
        Options.Focusing = False
-        Width = 150
+        Width = 134
      end
      object Tv2GYNote: TcxGridDBColumn
        Caption = #24037#33402#22791#27880
        DataBinding.FieldName = 'GYNote'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 90
+        Width = 140
      end
      object Tv2Editer: TcxGridDBColumn
        Caption = #26368#21518#20462#25913#20154
        DataBinding.FieldName = 'Editer'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 104
+        Width = 88
      end
      object Tv2Column1: TcxGridDBColumn
        Caption = #26368#21518#20462#25913#26102#38388
        DataBinding.FieldName = 'Edittime'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 112
+        Width = 66
      end
    end
    object cxGridLevel1: TcxGridLevel
      GridView = Tv2
    end
  end
-  object cxTabControl1: TcxTabControl [4]
+  object cxTabControl1: TcxTabControl [3]
    Left = 0
    Top = 76
    Width = 1467
@ -280,13 +273,15 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
    ClientRectRight = 1467
    ClientRectTop = 19
  end
-  object cxGrid1: TcxGrid [5]
+  object cxGrid1: TcxGrid [4]
-    Left = 812
+    Left = 851
    Top = 99
-    Width = 655
+    Width = 616
    Height = 494
    Align = alClient
    TabOrder = 4
    ExplicitLeft = 854
    ExplicitTop = 105
    object TV1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
@ -366,6 +361,13 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
      GridView = TV1
    end
  end
  object cxSplitter1: TcxSplitter [5]
    Left = 848
    Top = 99
    Width = 3
    Height = 494
    Control = cxGrid2
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_DyePlan.ADOLink
    Left = 281
--- a/F02染色计划单/U_DyeTechnicsList.pas
+++ b/F02染色计划单/U_DyeTechnicsList.pas
@ -58,13 +58,13 @@ type
    ToolButton4: TToolButton;
    ToolButton5: TToolButton;
    TV1PSID: TcxGridDBColumn;
    Splitter1: TSplitter;
    TV1All_Detail: TcxGridDBColumn;
    TV1ALL_NOTE: TcxGridDBColumn;
    TV1All_zhuji: TcxGridDBColumn;
    Tv2Editer: TcxGridDBColumn;
    Tv2Column1: TcxGridDBColumn;
    Tv2GYNote: TcxGridDBColumn;
    cxSplitter1: TcxSplitter;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -92,6 +92,9 @@ type
    procedure InitGrid();
    procedure SetStatus();
    procedure InitGlide();
    procedure WriteSpliterPosition();
    procedure ReadSpliterPosition();
  public
    fmanage: string;
  end;
@ -177,6 +180,35 @@ begin
  end;
 end;
 procedure TfrmDyeTechnicsList.WriteSpliterPosition();
 var
  IniFile: TIniFile;
  leftPos: Integer;
 begin
  try
    IniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'SpliterPosition.INI');
    IniFile.WriteInteger('DyeTechnicsList_Spliter', 'Position', cxSplitter1.Control.Width);
  finally
    IniFile.Free;
  end;
 end;
 procedure TfrmDyeTechnicsList.ReadSpliterPosition();
 var
  IniFile: TIniFile;
  leftPos1: Integer;
 begin
  try
    IniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'SpliterPosition.INI');
    leftPos1 := IniFile.ReadInteger('DyeTechnicsList_Spliter', 'Position', 848);
    cxSplitter1.Control.Width := leftPos1;
  finally
    IniFile.Free;
  end;
 end;
 procedure TfrmDyeTechnicsList.FormDestroy(Sender: TObject);
 begin
  inherited;
@ -270,6 +302,8 @@ begin
  inherited;
  ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, '工艺管理');
  ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, '工艺管理');
  ReadSpliterPosition();
  SetStatus();
  InitGrid();
  KeyPreview := True;
@ -314,6 +348,7 @@ procedure TfrmDyeTechnicsList.ToolButton3Click(Sender: TObject);
 begin
  WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, '工艺管理');
  WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, '工艺管理');
  WriteSpliterPosition();
 end;
 procedure TfrmDyeTechnicsList.ToolButton4Click(Sender: TObject);
--- a/F04染色刷卡/DyeProcess.dproj.local
+++ b/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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.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.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.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.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.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.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.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj</Transaction>
    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.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>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染色刷卡\U_DyePCDetailsList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.dfm</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.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas</Transaction>
+    <Transaction>2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10sxYilanbuyi"/>
--- a/F04染色刷卡/DyeProcess.identcache
+++ b/F04染色刷卡/DyeProcess.identcache
--- a/F04染色刷卡/U_DyePCDetailsList.dfm
+++ b/F04染色刷卡/U_DyePCDetailsList.dfm
@ -1,7 +1,7 @@
 inherited frmDyePCDetailsList: TfrmDyePCDetailsList
  Caption = #25490#20135#20449#24687#26126#32454
  ClientHeight = 584
-  ClientWidth = 1216
+  ClientWidth = 1396
  Color = clBtnFace
  Font.Charset = DEFAULT_CHARSET
  Font.Height = -11
@ -9,7 +9,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
  OldCreateOrder = True
  WindowState = wsMaximized
  OnKeyDown = FormKeyDown
-  ExplicitWidth = 1232
+  ExplicitLeft = -315
  ExplicitWidth = 1412
  ExplicitHeight = 623
  PixelsPerInch = 96
  TextHeight = 13
@ -17,7 +18,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
    Tag = 1
    Left = 0
    Top = 0
-    Width = 1216
+    Width = 1396
    Height = 38
    AutoSize = True
    ButtonHeight = 38
@ -36,6 +37,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
    ExplicitWidth = 1216
    object TBRafresh: TToolButton
      Left = 0
      Top = 0
@ -104,7 +106,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
  object Panel1: TPanel [1]
    Left = 0
    Top = 38
-    Width = 1216
+    Width = 1396
    Height = 83
    Align = alTop
    BevelInner = bvRaised
@ -505,6 +507,42 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
      TabOrder = 15
      OnKeyPress = pcidKeyPress
    end
    object Panel4: TPanel
      Left = 1127
      Top = 6
      Width = 60
      Height = 25
      Caption = #26410#25490#20135
      Color = 13421823
      Font.Charset = ANSI_CHARSET
      Font.Color = clWindowText
      Font.Height = -16
      Font.Name = #24494#36719#38597#40657
      Font.Style = []
      ParentBackground = False
      ParentFont = False
      TabOrder = 16
    end
    object Panel5: TPanel
      Left = 1193
      Top = 6
      Width = 60
      Height = 25
      Caption = #25490#20135#26410#25253#24037
      Color = clWindow
      ParentBackground = False
      TabOrder = 17
    end
    object Panel6: TPanel
      Left = 1259
      Top = 6
      Width = 67
      Height = 25
      Caption = #24050#19978#26426#26410#19979#26426
      Color = 14737632
      ParentBackground = False
      TabOrder = 18
    end
  end
  object MovePanel2: TMovePanel [2]
    Left = 351
@ -526,10 +564,11 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
  object Panel2: TPanel [3]
    Left = 0
    Top = 121
-    Width = 1216
+    Width = 1396
    Height = 463
    Align = alClient
    TabOrder = 3
    ExplicitWidth = 1216
    object cxGrid1: TcxGrid
      Left = 1
      Top = 1
@ -537,7 +576,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
      Height = 461
      Align = alLeft
      TabOrder = 0
-      ExplicitTop = 2
+      ExplicitTop = 0
      object Tv1: TcxGridDBTableView
        OnKeyDown = Tv1KeyDown
        Navigator.Buttons.CustomButtons = <>
@ -662,10 +701,11 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
    object cxGrid2: TcxGrid
      Left = 824
      Top = 1
-      Width = 391
+      Width = 571
      Height = 461
      Align = alClient
      TabOrder = 1
      ExplicitTop = 2
      object Tv2: TcxGridDBTableView
        OnKeyDown = Tv2KeyDown
        Navigator.Buttons.CustomButtons = <>
--- a/F04染色刷卡/U_DyePCDetailsList.pas
+++ b/F04染色刷卡/U_DyePCDetailsList.pas
@ -121,6 +121,9 @@ type
    SBZM2: TSpeedButton;
    SBCCQX2: TSpeedButton;
    SBPD1: TSpeedButton;
    Panel4: TPanel;
    Panel5: TPanel;
    Panel6: TPanel;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
@ -1095,8 +1098,8 @@ begin
      msql1 := 'and isComplete is not null'
    else if cxComboBox1.Text = '报工未完成' then
      msql1 := 'and isComplete = 0'
-    else if cxComboBox1.Text = '已完成' then
+//    else if cxComboBox1.Text = '已完成' then
-      msql1 := 'and isComplete = 1'
+//      msql1 := 'and isComplete = 1'
    else
      msql1 := '';
@ -1106,8 +1109,10 @@ begin
      close;
      filtered := false;
      sql.Clear;
-      SQL.Add(' select * from V_Dye_Cloth_PaiGang where 1=1 ' + msql1 + fsql2);
+      SQL.Add(' select A.* from V_Dye_Cloth_PaiGang A where 1=1 ' + msql1);
-//      ShowMessage(sql.Text);
+      sql.Add(' AND  EXISTS ( SELECT * from Dye_Plan_Card X where X.KaZu = A.PCID and X.Status = ''10'') ');
      SQL.Add(fsql2);
      //      ShowMessage(sql.Text);
      Open;
    end;
@ -1268,7 +1273,7 @@ end;
 procedure TfrmDyePCDetailsList.ToolButton1Click(Sender: TObject);
 begin
  WriteCxGrid(self.Caption + tv1.Name, Tv1, '排产信息明细');
-  WriteCxGrid(self.Caption + tv1.Name, Tv1, '排产信息明细');
+  WriteCxGrid(self.Caption + tv2.Name, Tv2, '排产信息明细');
 end;
 procedure TfrmDyePCDetailsList.Tv1BegTimePropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
@ -1397,13 +1402,14 @@ begin
  // 设置不同状态的颜色和字体
-  if (not VarIsNull(isComplete)) and (isComplete = true) then // 成品入库
+//  if (not VarIsNull(isComplete)) and (isComplete = true) then // 成品入库
-  begin
+//  begin
-    ACanvas.Brush.Color := $00E0FFE0;    // 浅绿色背景
+//    ACanvas.Brush.Color := $00E0FFE0;    // 浅绿色背景
-    ACanvas.Font.Color := $00008000;
+//    ACanvas.Font.Color := $00008000;
-    ACanvas.Font.Style := [fsBold];
+//    ACanvas.Font.Style := [fsBold];
-  end
+//  end
-  else if (not VarIsNull(isComplete)) and (isComplete = False) then // 生产一部分
+//  else
  if (not VarIsNull(isComplete))  then // 生产一部分       and (isComplete = False)
  begin
    ACanvas.Brush.Color := $00E0E0E0;    // 浅灰色背景
    ACanvas.Font.Color := clGray;
--- a/F05染色检验/DyeInsp.dproj.local
+++ b/F05染色检验/DyeInsp.dproj.local
@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
    <Transaction>1899/12/30 00:00:00.000.664,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.664,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
    <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>2025/10/30 16:43:17.000.471,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F05染色检验\U_DyeCardRoll.pas</Transaction>
  </Transactions>
--- a/F05染色检验/DyeInsp.identcache
+++ b/F05染色检验/DyeInsp.identcache
--- a/F05染色检验/DyeInspLogin.dproj.local
+++ b/F05染色检验/DyeInspLogin.dproj.local
@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="logon.pas"/>
+    <File Path="DbPanel"/>
-    <File Path="logon.dfm"/>
+    <File Path="DbPanel\MovePanel.pas"/>
    <File Path="spmain.pas"/>
    <File Path="spmain.dfm"/>
    <File Path="delphitwain"/>
    <File Path="delphitwain\DelphiTwain.pas"/>
    <File Path="delphitwain\DelphiTwainUtils.pas"/>
    <File Path="delphitwain\Twain.pas"/>
    <File Path="DbPanel"/>
    <File Path="DbPanel\MovePanel.pas"/>
    <File Path="AES.pas"/>
    <File Path="ElAES.pas"/>
-    <File Path="U_upPassword.pas"/>
+    <File Path="JDAESExtend.pas"/>
-    <File Path="U_upPassword.dfm"/>
+    <File Path="logon.pas"/>
    <File Path="logon.dfm"/>
    <File Path="spmain.pas"/>
    <File Path="spmain.dfm"/>
    <File Path="U_iniParam.pas"/>
    <File Path="U_Link.pas"/>
    <File Path="U_Link.dfm"/>
-    <File Path="U_iniParam.pas"/>
+    <File Path="U_upPassword.pas"/>
-    <File Path="JDAESExtend.pas"/>
+    <File Path="U_upPassword.dfm"/>
  </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj</Transaction>
  </Transactions>
 </BorlandProject>
--- a/F05染色检验/DyeInspLogin.identcache
+++ b/F05染色检验/DyeInspLogin.identcache
--- a/F05染色检验/U_DyeCardRoll.dfm
+++ b/F05染色检验/U_DyeCardRoll.dfm
@ -29,7 +29,6 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
    ExplicitTop = -6
    object TBRafresh: TToolButton
      Left = 0
      Top = 0
@ -90,7 +89,7 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
    BevelOuter = bvLowered
    Color = clSkyBlue
    TabOrder = 1
-    ExplicitTop = 44
+    ExplicitTop = 32
    object Label1: TLabel
      Left = 18
      Top = 17
@ -132,7 +131,7 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
      ParentFont = False
    end
    object Label11: TLabel
-      Left = 223
+      Left = 404
      Top = 43
      Width = 52
      Height = 12
@ -157,6 +156,58 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label2: TLabel
      Left = 223
      Top = 43
      Width = 39
      Height = 12
      Caption = #21345#32452#21495
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label4: TLabel
      Left = 588
      Top = 17
      Width = 52
      Height = 12
      Caption = #25104#21697#21517#31216
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label5: TLabel
      Left = 588
      Top = 43
      Width = 52
      Height = 12
      Caption = #24037#24207#21517#31216
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object Label6: TLabel
      Left = 773
      Top = 17
      Width = 26
      Height = 12
      Caption = #24037#24207
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
    end
    object BegDate: TDateTimePicker
      Left = 76
      Top = 13
@ -197,7 +248,7 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
    end
    object PCID: TEdit
      Tag = 2
-      Left = 281
+      Left = 462
      Top = 39
      Width = 100
      Height = 20
@ -213,6 +264,42 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
      TabOrder = 5
      OnChange = OrderNoChange
    end
    object KaZu: TEdit
      Tag = 2
      Left = 281
      Top = 39
      Width = 100
      Height = 20
      TabOrder = 6
      OnChange = OrderNoChange
    end
    object C_Name: TEdit
      Tag = 2
      Left = 646
      Top = 13
      Width = 100
      Height = 20
      TabOrder = 7
      OnChange = OrderNoChange
    end
    object GlideName: TEdit
      Tag = 2
      Left = 646
      Top = 39
      Width = 100
      Height = 20
      TabOrder = 8
      OnChange = OrderNoChange
    end
    object GlideNo: TEdit
      Tag = 2
      Left = 805
      Top = 13
      Width = 100
      Height = 20
      TabOrder = 9
      OnChange = OrderNoChange
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
@ -237,6 +324,10 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
        item
          Format = #20849' 0 '#34892
          Kind = skCount
        end
        item
          Kind = skSum
          Column = Tv1RollMeter
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
@ -246,6 +337,14 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
      Styles.Header = DataLink_DyeInsp.Default
      Styles.Inactive = DataLink_DyeInsp.SHuangSe
      Styles.Selection = DataLink_DyeInsp.SHuangSe
      object Tv1Column1: TcxGridDBColumn
        Caption = #36873#25321
        DataBinding.FieldName = 'SSel'
        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCheckBoxProperties'
        HeaderAlignmentHorz = taCenter
        Width = 46
      end
      object Tv1OrderNo: TcxGridDBColumn
        Caption = #35745#21010#21333#21495
        DataBinding.FieldName = 'OrderNo'
@ -407,62 +506,6 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object Tv1CCQXRollMeter: TcxGridDBColumn
        Caption = #38271#36710#28165#27927#21518#21367#26729
        DataBinding.FieldName = 'CCQXRollMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 121
      end
      object Tv1RGQXRollMeter: TcxGridDBColumn
        Caption = #21367#26579#32568#28165#27927#21518#21367#26729
        DataBinding.FieldName = 'RGQXRollMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 137
      end
      object Tv1JGQXRollMeter: TcxGridDBColumn
        Caption = #26426#32568#28165#27927#21518#21367#26729
        DataBinding.FieldName = 'JGQXRollMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 121
      end
      object Tv1DXRollMeter: TcxGridDBColumn
        Caption = #24178#23450#22411#21518#21367#26729
        DataBinding.FieldName = 'DXRollMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv1FSRollMeter: TcxGridDBColumn
        Caption = #19979#27700#23450#22411#21518#21367#26729
        DataBinding.FieldName = 'FSRollMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 115
      end
      object Tv1FPRollMeter: TcxGridDBColumn
        Caption = #21457#27873#21518#21367#26729
        DataBinding.FieldName = 'FPRollMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv1GJRollMeter: TcxGridDBColumn
        Caption = #21038#33014#21518#21367#26729
        DataBinding.FieldName = 'GJRollMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
      object Tv1ZMRollMeter: TcxGridDBColumn
        Caption = #36711#27611#21518#21367#26729
        DataBinding.FieldName = 'ZMRollMeter'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 100
      end
    end
    object cxGrid1Level1: TcxGridLevel
      GridView = Tv1
@ -499,11 +542,11 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
    Connection = DataLink_DyeInsp.ADOLink
    Top = 233
  end
-  object cxGridPopupMenu1: TcxGridPopupMenu
+  object GPM_1: TcxGridPopupMenu
    Grid = cxGrid1
    PopupMenus = <>
-    Left = 636
+    Left = 332
-    Top = 328
+    Top = 248
  end
  object ADOQueryCmd: TADOQuery
    Connection = DataLink_DyeInsp.ADOLink
--- a/F05染色检验/U_DyeCardRoll.pas
+++ b/F05染色检验/U_DyeCardRoll.pas
@ -31,7 +31,7 @@ type
    Tv1: TcxGridDBTableView;
    cxGrid1Level1: TcxGridLevel;
    cxGrid1: TcxGrid;
-    cxGridPopupMenu1: TcxGridPopupMenu;
+    GPM_1: TcxGridPopupMenu;
    ADOQueryCmd: TADOQuery;
    ADOQueryMain: TADOQuery;
    ADOQueryTemp: TADOQuery;
@ -64,14 +64,6 @@ type
    Tv1KaZuPiece: TcxGridDBColumn;
    Tv1KaZuQty: TcxGridDBColumn;
    Tv1RollNumber: TcxGridDBColumn;
    Tv1CCQXRollMeter: TcxGridDBColumn;
    Tv1RGQXRollMeter: TcxGridDBColumn;
    Tv1JGQXRollMeter: TcxGridDBColumn;
    Tv1DXRollMeter: TcxGridDBColumn;
    Tv1FSRollMeter: TcxGridDBColumn;
    Tv1FPRollMeter: TcxGridDBColumn;
    Tv1GJRollMeter: TcxGridDBColumn;
    Tv1ZMRollMeter: TcxGridDBColumn;
    Tv1C_Name: TcxGridDBColumn;
    Tv1F_Name: TcxGridDBColumn;
    Tv1C_PlanQty: TcxGridDBColumn;
@ -88,6 +80,15 @@ type
    Tv1GlideNo: TcxGridDBColumn;
    Tv1GlideName: TcxGridDBColumn;
    Tv1RollMeter: TcxGridDBColumn;
    Label2: TLabel;
    KaZu: TEdit;
    Label4: TLabel;
    C_Name: TEdit;
    Label5: TLabel;
    GlideName: TEdit;
    Tv1Column1: TcxGridDBColumn;
    Label6: TLabel;
    GlideNo: TEdit;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
--- a/F05染色检验/testDll.identcache
+++ b/F05染色检验/testDll.identcache