12.11

2025-12-11 17:31:55 +08:00 · 2025-12-11 17:31:55 +08:00 · 45614bc048
commit 45614bc048
parent 3a5cea8769
28 changed files with 901 additions and 316 deletions
--- a/A02基础产品管理/ClothInfo.dproj.local
+++ b/A02基础产品管理/ClothInfo.dproj.local
@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.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.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.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.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.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.583,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.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.187,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.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.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.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.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.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.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.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.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.814,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.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.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.583,=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.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.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.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.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.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.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.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.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.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.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.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.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>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10szXIANGYING"/>
--- a/A02基础产品管理/ClothInfo.identcache
+++ b/A02基础产品管理/ClothInfo.identcache
--- a/A02基础产品管理/U_ClothInfoInput.dfm
+++ b/A02基础产品管理/U_ClothInfoInput.dfm
@ -72,6 +72,7 @@ object frmClothInfoInput: TfrmClothInfoInput
    ParentColor = False
    ParentCtl3D = False
    TabOrder = 1
+    ExplicitTop = 44
    object Label1: TLabel
      Left = 31
      Top = 9
@ -239,6 +240,7 @@ object frmClothInfoInput: TfrmClothInfoInput
      Font.Name = #23435#20307
      Font.Style = [fsBold]
      ParentFont = False
+      ReadOnly = True
      TabOrder = 0
      OnKeyPress = CYColorKeyPress
    end
@ -434,6 +436,7 @@ object frmClothInfoInput: TfrmClothInfoInput
    ParentFont = False
    ShowCaptions = True
    TabOrder = 2
+    ExplicitTop = 171
    object ToolButton2: TToolButton
      Left = 0
      Top = 0
--- a/A02基础产品管理/U_ClothInfoInput.pas
+++ b/A02基础产品管理/U_ClothInfoInput.pas
@ -74,6 +74,7 @@ type
    Fint: Integer;
    procedure InitGrid();
    function SaveData(): Boolean;
+    function GetNextCode(const ACode: string): string;
    { Private declarations }
  public
    FBCIID, FCTID: string;
@ -162,6 +163,21 @@ begin

 end;

+function TfrmClothInfoInput.GetNextCode(const ACode: string): string;
+var
+  NumStr: string;
+  Num: Integer;
+begin
+  // 提取数字部分（假设格式总是 "A" + 4位数字）
+  NumStr := Copy(ACode, 2, 4);
+
+  // 转换为整数并加1
+  Num := StrToInt(NumStr) + 1;
+
+  // 格式化为4位数字，前补0
+  Result := 'A' + Format('%.4d', [Num]);
+end;
+
 procedure TfrmClothInfoInput.FormShow(Sender: TObject);
 begin
  InitGrid();
@ -171,6 +187,19 @@ begin
    BCIID.text := '';
    C_Code.text := '';
  end;
+
+  if FBCIID = '' then
+  begin
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      SQL.Add(' select max(C_Code) as maxC_code from BS_Cloth_Info');
+      Open;
+    end;
+    C_Code.Text := GetNextCode(ADOQueryCmd.FieldByName('maxC_Code').AsString);
+  end;
+
 end;

 procedure TfrmClothInfoInput.TBCloseClick(Sender: TObject);
--- a/A02基础产品管理/testDll.identcache
+++ b/A02基础产品管理/testDll.identcache
--- a/E03梭织坯布检验/TatInsp.dproj.local
+++ b/E03梭织坯布检验/TatInsp.dproj.local
@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.183,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.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.638,=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_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.183,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.367,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.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.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.630,=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.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.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.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.dproj</Transaction>
    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.292,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.995,=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatClothInspList.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.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.099,=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.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.dproj</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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.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.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.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj</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.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.292,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj</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>2025/11/24 13:58:34.000.809,=D:\Dp10Repo\项目代码\D10szXIANGYING\E03梭织坯布检验\U_TatMachCutHZList.pas</Transaction>
    <Transaction>2025/11/24 15:19:14.000.013,=D:\Dp10Repo\项目代码\D10szXIANGYING\E03梭织坯布检验\U_TatClothInspHZList.pas</Transaction>
  </Transactions>
--- a/E03梭织坯布检验/TatInsp.identcache
+++ b/E03梭织坯布检验/TatInsp.identcache
--- a/E03梭织坯布检验/TatInspLogin.dproj.local
+++ b/E03梭织坯布检验/TatInspLogin.dproj.local
@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="DbPanel"/>
-    <File Path="DbPanel\MovePanel.pas"/>
-    <File Path="delphitwain"/>
-    <File Path="delphitwain\DelphiTwain.pas"/>
-    <File Path="delphitwain\DelphiTwainUtils.pas"/>
-    <File Path="delphitwain\Twain.pas"/>
-    <File Path="AES.pas"/>
-    <File Path="ElAES.pas"/>
-    <File Path="JDAESExtend.pas"/>
    <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="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="U_upPassword.dfm"/>
+    <File Path="U_Link.pas"/>
+    <File Path="U_Link.dfm"/>
+    <File Path="U_iniParam.pas"/>
+    <File Path="JDAESExtend.pas"/>
  </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.976,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInspLogin.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\DyeInspLogin.dproj</Transaction>
  </Transactions>
 </BorlandProject>
--- a/E03梭织坯布检验/TatInspLogin.identcache
+++ b/E03梭织坯布检验/TatInspLogin.identcache
--- a/E03梭织坯布检验/U_TatClothInspHZList.dfm
+++ b/E03梭织坯布检验/U_TatClothInspHZList.dfm
@ -254,7 +254,6 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList
    ParentFont = False
    PopupMenu = PM_1
    TabOrder = 2
-    ExplicitTop = 103
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -365,6 +364,38 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList
        item
          Kind = skSum
          Column = Tv1Column19
+        end
+        item
+          Kind = skSum
+          Column = Tv1YDpf
+        end
+        item
+          Kind = skSum
+          Column = Tv1xjPF
+        end
+        item
+          Kind = skSum
+          Column = Tv1edpf
+        end
+        item
+          Kind = skSum
+          Column = Tv1cspf
+        end
+        item
+          Kind = skSum
+          Column = Tv1fqPF
+        end
+        item
+          Kind = skSum
+          Column = Tv1fbJS
+        end
+        item
+          Kind = skSum
+          Column = Tv1fbqty
+        end
+        item
+          Kind = skSum
+          Column = Tv1FBPF
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
@ -513,6 +544,13 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
+      object Tv1YDpf: TcxGridDBColumn
+        Caption = #20248#31561#24179#26041
+        DataBinding.FieldName = 'YDpf'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
      object Tv1Column9: TcxGridDBColumn
        Caption = #23567#21367#21367#25968
        DataBinding.FieldName = 'xjJS'
@ -527,6 +565,13 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
+      object Tv1xjPF: TcxGridDBColumn
+        Caption = #23567#21367#24179#26041
+        DataBinding.FieldName = 'xjPF'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
      object Tv1Column7: TcxGridDBColumn
        Caption = #20108#31561#21367#25968
        DataBinding.FieldName = 'edJS'
@ -541,6 +586,13 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
+      object Tv1edpf: TcxGridDBColumn
+        Caption = #20108#31561#24179#26041
+        DataBinding.FieldName = 'edpf'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
      object Tv1Column17: TcxGridDBColumn
        Caption = #27979#35797#21367#25968
        DataBinding.FieldName = 'csJS'
@ -555,6 +607,13 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
+      object Tv1cspf: TcxGridDBColumn
+        Caption = #27979#35797#24179#26041
+        DataBinding.FieldName = 'cspf'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
      object Tv1Column13: TcxGridDBColumn
        Caption = #20998#20999#21367#25968
        DataBinding.FieldName = 'fqJS'
@ -569,6 +628,13 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
+      object Tv1fqPF: TcxGridDBColumn
+        Caption = #20998#20999#24179#26041
+        DataBinding.FieldName = 'fqPF'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
      object Tv1fbJS: TcxGridDBColumn
        Caption = #24223#24067#21367#25968
        DataBinding.FieldName = 'fbJS'
@ -583,6 +649,13 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
+      object Tv1FBPF: TcxGridDBColumn
+        Caption = #24223#24067#24179#26041
+        DataBinding.FieldName = 'FBPF'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
      object Tv1Column19: TcxGridDBColumn
        Caption = #25439#32791#24179#26041
        DataBinding.FieldName = 'SHpf'
--- a/E03梭织坯布检验/U_TatClothInspHZList.pas
+++ b/E03梭织坯布检验/U_TatClothInspHZList.pas
@ -78,6 +78,12 @@ type
    C_GramWeight: TEdit;
    Tv1Column15: TcxGridDBColumn;
    Tv1Column23: TcxGridDBColumn;
+    Tv1YDpf: TcxGridDBColumn;
+    Tv1edpf: TcxGridDBColumn;
+    Tv1xjPF: TcxGridDBColumn;
+    Tv1cspf: TcxGridDBColumn;
+    Tv1fqPF: TcxGridDBColumn;
+    Tv1FBPF: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
@ -192,20 +198,33 @@ begin
      SQL.Add(',SHpf=SUM(CASE WHEN ISNUMERIC(A.SHMETER) = 1 AND ISNUMERIC(A.C_WIDTH) = 1  ');
      SQL.Add('     THEN CAST(A.SHMETER AS DECIMAL(18,2))/100 * CAST(A.C_WIDTH AS DECIMAL(18,2)) ');
      SQL.Add('     ELSE 0 END)');
+
      SQL.Add(',SUM(CASE WHEN A.GRADE=''优等品'' THEN 1 ELSE 0 END )AS YDJS');
      SQL.Add(',SUM(CASE WHEN A.GRADE=''优等品'' THEN A.meter ELSE 0 END )AS Ydqty');
+      SQL.Add(',YDpf=SUM(CASE WHEN A.GRADE=''优等品'' THEN A.meter ELSE 0 END )*A.C_Width/100 ');
+
      SQL.Add(',SUM(CASE WHEN A.GRADE=''二等品'' THEN 1 ELSE 0 END )AS edJS');
      SQL.Add(',SUM(CASE WHEN A.GRADE=''二等品'' THEN A.meter ELSE 0 END )AS edqty');
+      SQL.Add(',edpf=SUM(CASE WHEN A.GRADE=''二等品'' THEN A.meter ELSE 0 END )*A.C_Width/100 ');
+
      SQL.Add(',SUM(CASE WHEN A.GRADE=''小卷'' THEN 1 ELSE 0 END )AS xjJS');
      SQL.Add(',SUM(CASE WHEN A.GRADE=''小卷'' THEN A.meter ELSE 0 END )AS xjqty');
+      SQL.Add(',xjpf=SUM(CASE WHEN A.GRADE=''小卷'' THEN A.meter ELSE 0 END )*A.C_Width/100 ');
+
      SQL.Add(',SUM(CASE WHEN (A.GRADE=''废布'' and A.meter>0) THEN 1 ELSE 0 END )AS fbJS');
      SQL.Add(',SUM(CASE WHEN A.GRADE=''废布'' THEN A.meter ELSE 0 END )AS fbqty');
+      SQL.Add(',fbpf=SUM(CASE WHEN A.GRADE=''废布'' THEN A.meter ELSE 0 END )*A.C_Width/100 ');
+
+
      SQL.Add(',SUM(CASE WHEN A.GRADE=''分切'' THEN 1 ELSE 0 END )AS fqJS');
      SQL.Add(',SUM(CASE WHEN A.GRADE=''分切'' THEN A.meter ELSE 0 END )AS fqqty');
+      SQL.Add(',fqpf=SUM(CASE WHEN A.GRADE=''分切'' THEN A.meter ELSE 0 END )*A.C_Width/100 ');
+
 //      SQL.Add(',SUM(CASE WHEN A.GRADE=''循环布'' THEN 1 ELSE 0 END )AS xhJS');
 //      SQL.Add(',SUM(CASE WHEN A.GRADE=''循环布'' THEN A.meter ELSE 0 END )AS xhqty');
      SQL.Add(',SUM(CASE WHEN A.GRADE=''测试'' THEN 1 ELSE 0 END )AS csJS');
      SQL.Add(',SUM(CASE WHEN A.GRADE=''测试'' THEN A.meter ELSE 0 END )AS csqty');
+     SQL.Add(',cspf=SUM(CASE WHEN A.GRADE=''测试'' THEN A.meter ELSE 0 END )*A.C_Width/100 ');


     // 添加优等率字段 - 优等卷数/(优等卷数+小卷卷数+二等卷数+测试卷数+分切卷数+废布卷数(排除米数为0的))
--- a/E03梭织坯布检验/U_TatClothInspList.dfm
+++ b/E03梭织坯布检验/U_TatClothInspList.dfm
@ -7,6 +7,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList
  FormStyle = fsMDIChild
  Position = poScreenCenter
  Visible = True
+  ExplicitLeft = -616
  ExplicitWidth = 1483
  ExplicitHeight = 621
  PixelsPerInch = 96
@ -240,6 +241,14 @@ inherited frmTatClothInspList: TfrmTatClothInspList
      ImageIndex = 7
      OnClick = TBCloseClick
    end
+    object stkInsert: TToolButton
+      Left = 911
+      Top = 0
+      Caption = 'stkInsert'
+      ImageIndex = 8
+      Visible = False
+      OnClick = stkInsertClick
+    end
  end
  object Panel1: TPanel [2]
    Left = 0
--- a/E03梭织坯布检验/U_TatClothInspList.pas
+++ b/E03梭织坯布检验/U_TatClothInspList.pas
@ -141,6 +141,7 @@ type
    Label16: TLabel;
    dept: TEdit;
    Tv1C_MXSHWidth: TcxGridDBColumn;
+    stkInsert: TToolButton;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBCloseClick(Sender: TObject);
@ -178,6 +179,7 @@ type
    procedure Button7Click(Sender: TObject);
    procedure cxTabControl1Change(Sender: TObject);
    procedure ToolButton3Click(Sender: TObject);
+    procedure stkInsertClick(Sender: TObject);
  private
    DQdate: TDateTime;
    FLeft, FTop: Integer;
@ -1125,6 +1127,40 @@ begin
  InitGrid();
 end;

+procedure TfrmTatClothInspList.stkInsertClick(Sender: TObject);
+begin
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    SQL.Add(' SELECT A.*  FROM Tat_Cloth_Inspect A WHERE  ');
+    sql.add(' NOT EXISTS ( SELECT 1 FROM Tat_Cloth_Stock B WHERE B.CIID = A.CIID ) ');
+    Open;
+  end;
+  ADOQueryCmd.First;
+
+  while not ADOQueryCmd.Eof do
+  begin
+//    with ADOQueryMain do
+//    begin
+//      Close;
+//      sql.clear;
+//      sql.add('update Tat_Cloth_Inspect SET CIIOFlag=''Î´Èë¿â'' WHERE CIID= '+QuotedStr(Trim( ADOQueryCmd.FieldByName('CIID').AsString)) );
+//      Open;
+//    end;
+
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.clear;
+      sql.add('exec P_Tat_Insp_In_Stk @CIID = '+QuotedStr(Trim( ADOQueryCmd.FieldByName('CIID').AsString)) );
+      ExecSQL;
+    end;
+    ADOQueryCmd.Next;
+  end;
+
+end;
+
 procedure TfrmTatClothInspList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
 begin
  Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
--- a/E03梭织坯布检验/U_TatMachCutHZList.dfm
+++ b/E03梭织坯布检验/U_TatMachCutHZList.dfm
@ -33,6 +33,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList
    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
+    ExplicitTop = 2
    object TBRafresh: TToolButton
      Left = 0
      Top = 0
@ -77,6 +78,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
+    ExplicitTop = 36
    object Label2: TLabel
      Left = 70
      Top = 36
@ -90,7 +92,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList
      Width = 39
      Height = 12
      Hint = '0'
-      Caption = #20135#21697#21517
+      Caption = #26426#21488#21495
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
@ -155,7 +157,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList
      TabOrder = 0
      OnClick = IsJYTimeClick
    end
-    object C_Name: TEdit
+    object Carno: TEdit
      Tag = 2
      Left = 237
      Top = 6
@ -163,7 +165,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList
      Height = 20
      Hint = '0'
      TabOrder = 5
-      OnKeyPress = C_NameKeyPress
+      OnKeyPress = CarnoKeyPress
    end
  end
  object cxGrid1: TcxGrid [2]
@ -181,6 +183,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList
    ParentFont = False
    PopupMenu = PM_1
    TabOrder = 2
+    ExplicitTop = 103
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -291,6 +294,34 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList
        item
          Kind = skSum
          Column = Tv1Column19
+        end
+        item
+          Kind = skSum
+          Column = Tv1fbJS
+        end
+        item
+          Kind = skSum
+          Column = Tv1fbqty
+        end
+        item
+          Kind = skSum
+          Column = Tv1qgMeter
+        end
+        item
+          Kind = skSum
+          Column = Tv1qgMeterGQ
+        end
+        item
+          Kind = skSum
+          Column = Tv1qgMeterAll
+        end
+        item
+          Kind = skSum
+          Column = Tv1ZJJS
+        end
+        item
+          Kind = skSum
+          Column = Tv1ZJqty
        end>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
--- a/E03梭织坯布检验/U_TatMachCutHZList.pas
+++ b/E03梭织坯布检验/U_TatMachCutHZList.pas
@ -36,7 +36,7 @@ type
    IsJYTime: TCheckBox;
    ToolButton4: TToolButton;
    Label5: TLabel;
-    C_Name: TEdit;
+    Carno: TEdit;
    PM_1: TPopupMenu;
    PM11: TMenuItem;
    N1: TMenuItem;
@ -85,7 +85,7 @@ type
    procedure PM11Click(Sender: TObject);
    procedure N1Click(Sender: TObject);
    procedure IsJYTimeClick(Sender: TObject);
-    procedure C_NameKeyPress(Sender: TObject; var Key: Char);
+    procedure CarnoKeyPress(Sender: TObject; var Key: Char);
  private
    CurrentPage, RecordsNumber: Integer;
    lstCust: TStringList;
@ -235,7 +235,7 @@ begin
  InitGrid();
 end;

-procedure TfrmTatMachCutHZList.C_NameKeyPress(Sender: TObject; var Key: Char);
+procedure TfrmTatMachCutHZList.CarnoKeyPress(Sender: TObject; var Key: Char);
 begin
  inherited;
  if Key = #13 then
--- a/E03梭织坯布检验/testDll.identcache
+++ b/E03梭织坯布检验/testDll.identcache
--- a/E04梭织坯布仓库/TatClothStk.dproj.local
+++ b/E04梭织坯布仓库/TatClothStk.dproj.local
@ -9,14 +9,14 @@
    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.dfm</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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.094,D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\TatClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\KnitClothStk.dproj</Transaction>
    <Transaction>1899/12/30 00:00:00.000.506,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.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.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.720,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.pas</Transaction>
--- a/E04梭织坯布仓库/U_TatClothCKHZList.dfm
+++ b/E04梭织坯布仓库/U_TatClothCKHZList.dfm
@ -77,6 +77,7 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
+    ExplicitTop = 44
    object Label2: TLabel
      Left = 70
      Top = 36
@ -98,6 +99,62 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
      Font.Style = [fsBold]
      ParentFont = False
    end
+    object Label1: TLabel
+      Left = 190
+      Top = 36
+      Width = 52
+      Height = 12
+      Hint = '0'
+      Caption = #21457#36135#30003#35831
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label3: TLabel
+      Left = 500
+      Top = 10
+      Width = 26
+      Height = 12
+      Hint = '0'
+      Caption = #23458#25143
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label6: TLabel
+      Left = 360
+      Top = 10
+      Width = 26
+      Height = 12
+      Hint = '0'
+      Caption = #38376#24133
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label7: TLabel
+      Left = 360
+      Top = 36
+      Width = 26
+      Height = 12
+      Hint = '0'
+      Caption = #20811#37325
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
    object BegDate: TDateTimePicker
      Left = 88
      Top = 6
@ -157,7 +214,7 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
    end
    object C_Name: TEdit
      Tag = 2
-      Left = 237
+      Left = 243
      Top = 6
      Width = 100
      Height = 20
@ -165,12 +222,69 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
      TabOrder = 5
      OnKeyPress = C_NameKeyPress
    end
+    object DRMID: TEdit
+      Tag = 2
+      Left = 243
+      Top = 32
+      Width = 100
+      Height = 20
+      Hint = '0'
+      TabOrder = 6
+      OnKeyPress = C_NameKeyPress
    end
-  object cxGrid1: TcxGrid [2]
+    object ToCoName: TEdit
+      Tag = 2
+      Left = 534
+      Top = 6
+      Width = 100
+      Height = 20
+      Hint = '0'
+      TabOrder = 7
+      OnKeyPress = C_NameKeyPress
+    end
+    object C_Width: TEdit
+      Tag = 2
+      Left = 391
+      Top = 6
+      Width = 100
+      Height = 20
+      Hint = '0'
+      TabOrder = 8
+      OnKeyPress = C_NameKeyPress
+    end
+    object C_GramWeight: TEdit
+      Tag = 2
+      Left = 391
+      Top = 32
+      Width = 100
+      Height = 20
+      Hint = '0'
+      TabOrder = 9
+      OnKeyPress = C_NameKeyPress
+    end
+  end
+  object PageControl1: TPageControl [2]
    Left = 0
-    Top = 137
+    Top = 105
    Width = 1540
-    Height = 463
+    Height = 495
+    ActivePage = TabSheet1
+    Align = alClient
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -16
+    Font.Name = #24494#36719#38597#40657
+    Font.Style = []
+    ParentFont = False
+    TabOrder = 2
+    ExplicitTop = 111
+    object TabSheet1: TTabSheet
+      Caption = #26377#20986#24211#21333#20986#24211
+      object cxGrid1: TcxGrid
+        Left = 0
+        Top = 0
+        Width = 1532
+        Height = 459
        Align = alClient
        BorderStyle = cxcbsNone
        Font.Charset = GB2312_CHARSET
@ -180,7 +294,8 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
        Font.Style = []
        ParentFont = False
        PopupMenu = PM_1
-    TabOrder = 2
+        TabOrder = 0
+        ExplicitHeight = 467
        object Tv1: TcxGridDBTableView
          Navigator.Buttons.CustomButtons = <>
          ScrollbarAnnotations.CustomAnnotations = <>
@ -268,7 +383,7 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
          end
          object Tv1DRMID: TcxGridDBColumn
            Caption = #21457#36135#30003#35831
-        DataBinding.FieldName = 'IONo'
+            DataBinding.FieldName = 'DRMID'
            DataBinding.IsNullValueType = True
            HeaderAlignmentHorz = taCenter
            Width = 92
@ -337,29 +452,176 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
          GridView = Tv1
        end
      end
-  object cxTabControl1: TcxTabControl [3]
+    end
+    object TabSheet2: TTabSheet
+      Caption = #26080#20986#24211#21333#20986#24211
+      ImageIndex = 1
+      object cxGrid2: TcxGrid
        Left = 0
-    Top = 105
-    Width = 1540
-    Height = 32
-    Align = alTop
+        Top = 0
+        Width = 1532
+        Height = 459
+        Align = alClient
+        BorderStyle = cxcbsNone
        Font.Charset = GB2312_CHARSET
        Font.Color = clWindowText
        Font.Height = -21
        Font.Name = #23435#20307
        Font.Style = []
        ParentFont = False
-    TabOrder = 3
-    Properties.CustomButtons.Buttons = <>
-    Properties.Style = 9
-    Properties.TabIndex = 0
-    Properties.Tabs.Strings = (
-      #26377#20986#24211#21333#20986#24211
-      #26080#20986#24211#21333#20986#24211)
-    OnChange = cxTabControl1Change
-    ClientRectBottom = 32
-    ClientRectRight = 1540
-    ClientRectTop = 28
+        PopupMenu = PM_1
+        TabOrder = 0
+        ExplicitHeight = 467
+        object Tv2: TcxGridDBTableView
+          Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
+          DataController.DataSource = DS_2
+          DataController.Filter.AutoDataSetFilter = True
+          DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+          DataController.Summary.DefaultGroupSummaryItems = <>
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skCount
+            end
+            item
+              Kind = skSum
+              Column = cxGridDBColumn9
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Format = #26816#39564#31995#25968'=#.##'
+              Kind = skAverage
+            end
+            item
+              Format = #25442#31639#31995#25968'=#.##'
+              Kind = skAverage
+            end
+            item
+              Kind = skSum
+              Column = cxGridDBColumn8
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end
+            item
+              Kind = skSum
+            end>
+          DataController.Summary.SummaryGroups = <>
+          OptionsCustomize.ColumnFiltering = False
+          OptionsView.Footer = True
+          OptionsView.GroupByBox = False
+          OptionsView.IndicatorWidth = 30
+          Styles.IncSearch = DataLink_TatClothStk.SHuangSe
+          Styles.Footer = DataLink_TatClothStk.Default
+          Styles.Header = DataLink_TatClothStk.Default
+          Styles.Inactive = DataLink_TatClothStk.SHuangSe
+          Styles.Selection = DataLink_TatClothStk.SHuangSe
+          object cxGridDBColumn1: TcxGridDBColumn
+            Caption = #36873#25321
+            DataBinding.FieldName = 'SSel'
+            DataBinding.IsNullValueType = True
+            PropertiesClassName = 'TcxCheckBoxProperties'
+            Properties.ImmediatePost = True
+            Properties.NullStyle = nssUnchecked
+            HeaderAlignmentHorz = taCenter
+            Options.Sorting = False
+            Width = 66
+          end
+          object cxGridDBColumn2: TcxGridDBColumn
+            Caption = #20986#24211#26102#38388
+            DataBinding.FieldName = 'IOTime'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 100
+          end
+          object cxGridDBColumn3: TcxGridDBColumn
+            Caption = #20986#24211#31867#22411
+            DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 92
+          end
+          object cxGridDBColumn5: TcxGridDBColumn
+            Caption = #21697#21517
+            DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 66
+          end
+          object cxGridDBColumn6: TcxGridDBColumn
+            Caption = #38376#24133
+            DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 90
+          end
+          object cxGridDBColumn7: TcxGridDBColumn
+            Caption = #20811#37325
+            DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 90
+          end
+          object cxGridDBColumn8: TcxGridDBColumn
+            Caption = #21367#25968
+            DataBinding.FieldName = 'js'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 66
+          end
+          object cxGridDBColumn9: TcxGridDBColumn
+            Caption = #31859#25968
+            DataBinding.FieldName = 'Meter'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Options.Editing = False
+            Width = 66
+          end
+          object cxGridDBColumn10: TcxGridDBColumn
+            Caption = #20844#26020
+            DataBinding.FieldName = 'NetWeight'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 80
+          end
+          object cxGridDBColumn11: TcxGridDBColumn
+            Caption = #24179#26041
+            DataBinding.FieldName = 'PF'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 80
+          end
+        end
+        object cxGridLevel1: TcxGridLevel
+          GridView = Tv2
+        end
+      end
+    end
  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_TatClothStk.ADOLink
@ -401,19 +663,19 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
  object GPM_1: TcxGridPopupMenu
    Grid = cxGrid1
    PopupMenus = <>
-    Left = 728
-    Top = 288
+    Left = 392
+    Top = 384
  end
  object CDS_1: TClientDataSet
    Aggregates = <>
    Params = <>
    BeforeOpen = CDS_1BeforeOpen
-    Left = 776
+    Left = 792
    Top = 284
  end
  object PM_1: TPopupMenu
-    Left = 560
-    Top = 384
+    Left = 216
+    Top = 336
    object N1: TMenuItem
      Caption = #20840#36873
      OnClick = N1Click
@ -423,4 +685,22 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList
      OnClick = PM11Click
    end
  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    BeforeOpen = CDS_1BeforeOpen
+    Left = 696
+    Top = 348
+  end
+  object DS_2: TDataSource
+    DataSet = CDS_2
+    Left = 732
+    Top = 348
+  end
+  object GPM_2: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 488
+    Top = 392
+  end
 end
--- a/E04梭织坯布仓库/U_TatClothCKHZList.pas
+++ b/E04梭织坯布仓库/U_TatClothCKHZList.pas
@ -35,26 +35,52 @@ type
    endTime: TDateTimePicker;
    IsJYTime: TCheckBox;
    ToolButton4: TToolButton;
-    cxGrid1: TcxGrid;
-    Tv1: TcxGridDBTableView;
-    v1Column22: TcxGridDBColumn;
-    v1Column23: TcxGridDBColumn;
-    v1Column10: TcxGridDBColumn;
-    Tv1Column3: TcxGridDBColumn;
-    cxGrid1Level1: TcxGridLevel;
    Label5: TLabel;
    C_Name: TEdit;
    PM_1: TPopupMenu;
    PM11: TMenuItem;
    N1: TMenuItem;
-    cxTabControl1: TcxTabControl;
+    Label1: TLabel;
+    DRMID: TEdit;
+    Label3: TLabel;
+    ToCoName: TEdit;
+    Label6: TLabel;
+    C_Width: TEdit;
+    Label7: TLabel;
+    C_GramWeight: TEdit;
+    PageControl1: TPageControl;
+    TabSheet1: TTabSheet;
+    TabSheet2: TTabSheet;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v1Column22: TcxGridDBColumn;
+    Tv1IOTime: TcxGridDBColumn;
    Tv1DRMID: TcxGridDBColumn;
-    Tv1ToCoName: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
    Tv1C_Width: TcxGridDBColumn;
    Tv1C_GramWeight: TcxGridDBColumn;
+    v1Column23: TcxGridDBColumn;
+    v1Column10: TcxGridDBColumn;
    Tv1NetWeight: TcxGridDBColumn;
    Tv1PF: TcxGridDBColumn;
-    Tv1IOTime: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid2: TcxGrid;
+    Tv2: TcxGridDBTableView;
+    cxGridDBColumn1: TcxGridDBColumn;
+    cxGridDBColumn2: TcxGridDBColumn;
+    cxGridDBColumn3: TcxGridDBColumn;
+    cxGridDBColumn5: TcxGridDBColumn;
+    cxGridDBColumn6: TcxGridDBColumn;
+    cxGridDBColumn7: TcxGridDBColumn;
+    cxGridDBColumn8: TcxGridDBColumn;
+    cxGridDBColumn9: TcxGridDBColumn;
+    cxGridDBColumn10: TcxGridDBColumn;
+    cxGridDBColumn11: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    CDS_2: TClientDataSet;
+    DS_2: TDataSource;
+    GPM_2: TcxGridPopupMenu;
+    Tv1ToCoName: TcxGridDBColumn;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
@ -84,6 +110,7 @@ type
    lstCust: TStringList;
    procedure InitGrid();
    procedure SetStatus();
+    procedure InitGrid2();
    { Private declarations }
  public
    canshu1: string;
@ -140,16 +167,16 @@ begin
      Close;
      sql.Clear;

-      sql.Add('SELECT A.C_CODE,A.C_Name,A.C_Width,A.C_GramWeight,A.IONo ');
+      sql.Add('SELECT A.C_CODE,A.C_Name,A.C_Width,A.C_GramWeight,A.IONO as DRMID ');
      sql.Add(',ToCoName=max(B.ToCoName),ioTime=min(ioTime) ');
      sql.Add(' ,js = count(*),Meter=sum(A.meter),NetWeight = sum(A.NetWeight)   ');
      sql.Add(',pf = CAST(A.C_Width AS DECIMAL(18,2))/100*sum(A.meter) ');
      sql.Add(' FROM V_Tat_Cloth_IO A   ');
      sql.Add(' left JOIN Tat_Cloth_DR_Main B on A.IONo = B.DRMID ');
-      sql.Add(' where A.IOFlag = ''³ö¿â'' and A.IONo<>'''' and A.IONo  is not null ');
+      sql.Add(' where A.IONo LIKE ''RSG%'' and A.IOFlag = ''³ö¿â'' ');
      sql.Add(WSql);
-      SQL.Add(' group by A.C_CODE ,A.C_Width,A.C_GramWeight,A.IONo,A.C_Name');
-      SQL.Add(' order by A.IONo');
+      SQL.Add(' group by A.C_CODE ,A.C_Width,A.C_GramWeight,A.IONO,A.C_Name');
+      SQL.Add(' order by A.IONO');



@ -168,6 +195,54 @@ begin

 end;

+
+procedure TfrmTatClothCKHZList.InitGrid2();
+var
+  WSql: string;
+begin
+
+  WSql := SGetFilters(Panel1, 1, 2);
+  if Trim(WSql) <> '' then
+    WSql := ' and ' + WSql;
+  if IsJYTime.Checked then
+  begin
+    WSql := WSql + ' and A.IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime));
+    WSql := WSql + ' and A.IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1));
+  end;
+
+  try
+    ADOQueryMain.DisableControls;
+
+    with ADOQueryMain do
+    begin
+      Filtered := False;
+      Close;
+      sql.Clear;
+      sql.Add('SELECT A.C_CODE,A.C_Name,A.C_Width,A.C_GramWeight,DRMID = '''' ');
+      sql.Add(',ioTime=min(ioTime),ioType=max(A.ioType)   ');
+      sql.Add(' ,js = count(*),Meter=sum(A.meter),NetWeight = sum(A.NetWeight)   ');
+      sql.Add(',pf = CAST(A.C_Width AS DECIMAL(18,2))/100*sum(A.meter) ');
+      sql.Add(' FROM V_Tat_Cloth_IO A   ');
+//      sql.Add(' left JOIN Tat_Cloth_DR_Main B on A.IONo = B.DRMID ');
+      sql.Add(' where  A.IONo not LIKE ''RSG%'' and A.IOFlag = ''³ö¿â''  ');
+      sql.Add(WSql);
+      SQL.Add(' group by A.C_CODE ,A.C_Width,A.C_GramWeight,A.C_Name');
+//      SQL.Add(' order by B.DRMID');
+
+
+//      showmessage(sql.text);
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, CDS_2);
+    SInitCDSData(ADOQueryMain, CDS_2);
+
+  finally
+    ADOQueryMain.EnableControls;
+    TV2.DataController.Filter.Clear;
+  end;
+
+end;
+
 procedure TfrmTatClothCKHZList.IsJYTimeClick(Sender: TObject);
 begin
  inherited;
@ -178,6 +253,7 @@ procedure TfrmTatClothCKHZList.TBRafreshClick(Sender: TObject);
 begin
  CurrentPage := 1;
  InitGrid();
+  InitGrid2();
 end;

 procedure TfrmTatClothCKHZList.CDS_1BeforeOpen(DataSet: TDataSet);
@ -234,6 +310,7 @@ begin
  BegDate.DateTime := EndDate.DateTime;
  SetStatus();
  InitGrid();
+  InitGrid2();
 end;

 procedure TfrmTatClothCKHZList.TBExportClick(Sender: TObject);
--- a/E04梭织坯布仓库/U_TatClothInList.dfm
+++ b/E04梭织坯布仓库/U_TatClothInList.dfm
@ -102,6 +102,7 @@ inherited frmTatClothInList: TfrmTatClothInList
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
+    ExplicitTop = 39
    object Label2: TLabel
      Left = 70
      Top = 36
@ -551,6 +552,7 @@ inherited frmTatClothInList: TfrmTatClothInList
    ParentFont = False
    PopupMenu = PM_1
    TabOrder = 3
+    ExplicitTop = 131
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
--- a/E04梭织坯布仓库/U_TatClothStkListPH.dfm
+++ b/E04梭织坯布仓库/U_TatClothStkListPH.dfm
@ -117,7 +117,6 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
-    ExplicitTop = 36
    object Label2: TLabel
      Left = 70
      Top = 36
@ -344,6 +343,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '0'
      TabOrder = 6
+      OnKeyPress = orderNoKeyPress
    end
    object STKID: TEdit
      Tag = 2
@ -353,6 +353,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '1'
      TabOrder = 7
+      OnKeyPress = orderNoKeyPress
    end
    object C_Name: TEdit
      Tag = 2
@ -362,6 +363,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '0'
      TabOrder = 8
+      OnKeyPress = orderNoKeyPress
    end
    object C_Color: TEdit
      Tag = 2
@ -371,6 +373,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '0'
      TabOrder = 9
+      OnKeyPress = orderNoKeyPress
    end
    object jyg: TEdit
      Tag = 2
@ -380,6 +383,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '0'
      TabOrder = 10
+      OnKeyPress = orderNoKeyPress
    end
    object C_Pattern: TEdit
      Tag = 2
@ -389,6 +393,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '0'
      TabOrder = 11
+      OnKeyPress = orderNoKeyPress
    end
    object C_Code: TEdit
      Tag = 2
@ -398,6 +403,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '0'
      TabOrder = 12
+      OnKeyPress = orderNoKeyPress
    end
    object ToCoName: TEdit
      Tag = 2
@ -407,6 +413,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '1'
      TabOrder = 13
+      OnKeyPress = orderNoKeyPress
    end
    object ckno: TEdit
      Tag = 2
@ -416,6 +423,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH
      Height = 20
      Hint = '0'
      TabOrder = 14
+      OnKeyPress = orderNoKeyPress
    end
    object BegDate2: TDateTimePicker
      Left = 266
--- a/E04梭织坯布仓库/U_TatClothStkListPH.pas
+++ b/E04梭织坯布仓库/U_TatClothStkListPH.pas
@ -275,6 +275,7 @@ begin
  SetStatus();
  v1Column4.Visible := false;
  v1Column4.Hidden := true;
+  InitGrid();
 end;

 procedure TfrmTatClothStkListPH.TBExportClick(Sender: TObject);
--- a/E04梭织坯布仓库/U_TatDRList.dfm
+++ b/E04梭织坯布仓库/U_TatDRList.dfm
@ -261,6 +261,7 @@ inherited frmTatDRList: TfrmTatDRList
      DataController.Summary.FooterSummaryItems = <>
      DataController.Summary.SummaryGroups = <>
      OptionsCustomize.ColumnFiltering = False
+      OptionsView.CellAutoHeight = True
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
      OptionsView.GroupFooters = gfAlwaysVisible
@ -637,6 +638,7 @@ inherited frmTatDRList: TfrmTatDRList
      #24050#21462#28040
      #20840#37096)
    OnChange = cxTabControl1Change
+    ExplicitTop = 127
    ClientRectRight = 0
    ClientRectTop = 0
  end
--- a/E04梭织坯布仓库/U_TatDRList.pas
+++ b/E04梭织坯布仓库/U_TatDRList.pas
@ -425,13 +425,27 @@ begin
  begin
    Close;
    sql.Clear;
-    sql.Add(' select * from Tat_Cloth_IO where ioflag=''出库''');
+    sql.Add(' select * from Tat_Cloth_IO where ioflag=''出库'' ');
    sql.add(' and IONo=''' + Trim(Order_Main.fieldbyname('DRMID').AsString) + '''');
    Open;
  end;
  if ADOQueryTemp.IsEmpty = False then
  begin
-    Application.MessageBox('已发货不能删除数据!', '提示', 0);
+    Application.MessageBox('出库数据不能删除!', '提示', 0);
+    exit;
+  end;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' select * from Tat_Cloth_IO where ioflag=''待出库'' ');
+    sql.add(' and IONo=''' + Trim(Order_Main.fieldbyname('DRMID').AsString) + '''');
+    Open;
+  end;
+  if ADOQueryTemp.IsEmpty = False then
+  begin
+    Application.MessageBox('待出库数据不能删除!', '提示', 0);
    exit;
  end;

--- 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.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.865,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.817,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
    <Transaction>1899/12/30 00:00:00.000.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.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.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.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.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm</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.069,=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.270,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="..\..\D10szXIANGYING"/>
--- a/F01染色坯布仓库/DyeGreyClothStk.identcache
+++ b/F01染色坯布仓库/DyeGreyClothStk.identcache
--- a/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm
+++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm
@ -10,7 +10,6 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
  Font.Name = #23435#20307
  Position = poScreenCenter
  OnClose = FormClose
-  ExplicitLeft = -489
  ExplicitWidth = 1356
  ExplicitHeight = 620
  PixelsPerInch = 96
@ -23,8 +22,6 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
    Height = 268
    Align = alClient
    TabOrder = 0
-    ExplicitLeft = 1
-    ExplicitTop = 33
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -354,8 +351,6 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
      ParentFont = False
      ShowCaptions = True
      TabOrder = 0
-      ExplicitLeft = 0
-      ExplicitTop = -5
      object ToolButton4: TToolButton
        Left = 0
        Top = 0
@ -557,7 +552,6 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
      Height = 205
      Align = alClient
      TabOrder = 0
-      ExplicitTop = 45
      object TV3: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
--- a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas
+++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas
@ -439,6 +439,13 @@ begin
    Application.MessageBox('数量不能为空!','提示',0);
    Exit;
  end; }
+
+  if CDS_Sub.Locate('C_Width', null, []) = True then
+  begin
+    Application.MessageBox('定型门幅不能为空!', '提示', 0);
+    Exit;
+  end;
+
  if CDS_Sub.Locate('QtyUnit', null, []) = True then
  begin
    Application.MessageBox('数量单位不能为空!', '提示', 0);