11

A00通用窗体/U_WBSpecSel.dfm

@@ -22,7 +22,7 @@ inherited frmWBSpecSel: TfrmWBSpecSel
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 99
+    ButtonWidth = 83
     Caption = 'ToolBar1'
     DisabledImages = BaseDataLink.cxImageList_bar
     Images = cxImageList_bar
@@ -37,8 +37,32 @@ inherited frmWBSpecSel: TfrmWBSpecSel
       ImageIndex = 12
       OnClick = ToolButton1Click
     end
+    object TbAdd: TToolButton
+      Left = 63
+      Top = 0
+      AutoSize = True
+      Caption = #26032#22686
+      ImageIndex = 2
+      OnClick = TbAddClick
+    end
+    object TbEdit: TToolButton
+      Left = 126
+      Top = 0
+      AutoSize = True
+      Caption = #20462#25913
+      ImageIndex = 3
+      OnClick = TbEditClick
+    end
+    object TbDelete: TToolButton
+      Left = 189
+      Top = 0
+      AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 5
+      OnClick = TbDeleteClick
+    end
     object TBSave: TToolButton
-      Left = 71
+      Left = 252
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -46,7 +70,7 @@ inherited frmWBSpecSel: TfrmWBSpecSel
       OnClick = TBSaveClick
     end
     object TBClose: TToolButton
-      Left = 174
+      Left = 339
       Top = 0
       AutoSize = True
       Caption = #20851#38381

A00通用窗体/U_WBSpecSel.pas

@@ -65,6 +65,9 @@ type
     cxImageList_bar: TcxImageList;
     Label2: TLabel;
     WB_Name: TEdit;
+    TbAdd: TToolButton;
+    TbEdit: TToolButton;
+    TbDelete: TToolButton;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
@@ -76,6 +79,9 @@ type
     procedure WB_CodeChange(Sender: TObject);
     procedure N1Click(Sender: TObject);
     procedure N2Click(Sender: TObject);
+    procedure TbAddClick(Sender: TObject);
+    procedure TbEditClick(Sender: TObject);
+    procedure TbDeleteClick(Sender: TObject);
   private
     procedure InitGrid();
     { Private declarations }
@@ -90,7 +96,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun;
+  U_DataLink, U_RTFun, U_WBSpecInPut;
 
 {$R *.dfm}
 
@@ -179,6 +185,66 @@ begin
   Close;
 end;
 
+procedure TfrmWBSpecSel.TbDeleteClick(Sender: TObject);
+begin
+  if CDS_1.IsEmpty then
+    Exit;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from Tat_WB_Card where WB_Code=''' + Trim(CDS_1.fieldbyname('WB_Code').AsString) + '''');
+    Open;
+  end;
+  if ADOQueryTemp.IsEmpty = False then
+  begin
+    Application.MessageBox('已开卡不能修改!', '提示', 0);
+    Exit;
+  end;
+  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add(' delete Tat_WB_Spec where WBSID=''' + Trim(CDS_1.fieldbyname('WBSID').AsString) + '''');
+      ExecSQL;
+    end;
+
+    ADOQueryCmd.Connection.CommitTrans;
+    CDS_1.Delete;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox('删除异常!', '提示', 0);
+  end;
+
+end;
+
+procedure TfrmWBSpecSel.TbEditClick(Sender: TObject);
+begin
+  if CDS_1.IsEmpty then
+    Exit;
+
+  try
+    frmWBSpecInPut := TfrmWBSpecInPut.Create(Application);
+    with frmWBSpecInPut do
+    begin
+      FWBSID := Trim(CDS_1.fieldbyname('WBSID').AsString);
+      FSTKName := self.FSTKName;
+      if ShowModal = 1 then
+      begin
+        Self.InitGrid();
+      end;
+    end;
+  finally
+    frmWBSpecInPut.Free;
+  end;
+end;
+
 procedure TfrmWBSpecSel.TBSaveClick(Sender: TObject);
 begin
   WriteCxGrid('µ¥Î»Ãû³Æ' + Trim(FSTKName), TV1, '×Ô¶¨ÒåÊý¾Ý');
@@ -191,6 +257,24 @@ begin
   ModalResult := 1;
 end;
 
+procedure TfrmWBSpecSel.TbAddClick(Sender: TObject);
+begin
+  try
+    frmWBSpecInPut := TfrmWBSpecInPut.Create(Application);
+    with frmWBSpecInPut do
+    begin
+      FWBSID := '';
+      FSTKName := self.FSTKName;
+      if ShowModal = 1 then
+      begin
+        Self.InitGrid();
+      end;
+    end;
+  finally
+    frmWBSpecInPut.Free;
+  end;
+end;
+
 procedure TfrmWBSpecSel.TV1DblClick(Sender: TObject);
 begin
   ModalResult := 1;

A02基础产品管理/ClothInfo.dpr

@@ -53,8 +53,9 @@ uses
   JDAESExtend in '..\A00通用方法\AES\JDAESExtend.pas',
   untAES in '..\A00通用方法\AES\untAES.pas',
   U_TatClothInfoInput in 'U_TatClothInfoInput.pas' {frmTatClothInfoInput},
-  U_WBSpecInPut2 in 'U_WBSpecInPut2.pas' {frmWBSpecInPut2},
+  U_PictureUpload in '..\A00通用窗体\U_PictureUpload.pas' {frmPictureUpload},
-  U_PictureUpload in '..\A00通用窗体\U_PictureUpload.pas' {frmPictureUpload};
+  U_WBSpecInPut in 'U_WBSpecInPut.pas' {frmWBSpecInPut},
+  U_WBSpecInPut2 in 'U_WBSpecInPut2.pas' {frmWBSpecInPut2};
 
 {$R *.res}
 

A02基础产品管理/ClothInfo.dproj

@@ -204,14 +204,18 @@
             <Form>frmTatClothInfoInput</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <DCCReference Include="U_WBSpecInPut2.pas">
-            <Form>frmWBSpecInPut2</Form>
-            <FormType>dfm</FormType>
-        </DCCReference>
         <DCCReference Include="..\A00通用窗体\U_PictureUpload.pas">
             <Form>frmPictureUpload</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_WBSpecInPut.pas">
+            <Form>frmWBSpecInPut</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_WBSpecInPut2.pas">
+            <Form>frmWBSpecInPut2</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

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

@@ -1,79 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <Transaction>1899/12/30 00:00:00.000.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.074,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.208,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\JDAESExtend.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.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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.074,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.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.993,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ReportImgSet.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.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.558,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.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.243,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\untAES.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.536,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.003,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_InputBoxSingleNumber.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.816,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.536,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_SysLogHelp.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.034,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.816,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.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.921,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_SysLogHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.003,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.346,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.441,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfo.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.337,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.dfm</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.980,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uFomat_JSON.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.418,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfoInput.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.048,=D:\Dp10Repo\public10\design\U_BaseList.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.325,=D:\Dp10RepoV1\项目代码\花蝴蝶\A02基础产品管理\U_TatClothInfoInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.155,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\ElAES.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.155,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\ElAES.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.325,=D:\Dp10RepoV1\项目代码\花蝴蝶\A02基础产品管理\U_TatClothInfoInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.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.944,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\U_HttpFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.629,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.272,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.833,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateTimeSel.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.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.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.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.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.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.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.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.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.893,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.684,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.518,=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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.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.944,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\U_HttpFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.243,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\untAES.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.082,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.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.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_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</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.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.082,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>2025/08/28 09:29:23.000.693,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10SZKaiXiYa"/>
@@ -170,5 +171,7 @@
     <File Path="U_YarnInList_Sel.dfm"/>
     <File Path="U_WBSpecInPut2.pas"/>
     <File Path="U_WBSpecInPut2.dfm"/>
+    <File Path="U_WBSpecInPut.pas"/>
+    <File Path="U_WBSpecInPut.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

A02基础产品管理/U_GKInput.dfm

@@ -0,0 +1,236 @@
+inherited frmGKInput: TfrmGKInput
+  Left = 261
+  Top = 149
+  Caption = #38050#25187#24405#20837
+  ClientHeight = 549
+  ClientWidth = 863
+  Color = clWhite
+  Font.Charset = GB2312_CHARSET
+  Font.Height = -16
+  OldCreateOrder = True
+  Position = poScreenCenter
+  OnClose = FormClose
+  ExplicitWidth = 879
+  ExplicitHeight = 588
+  PixelsPerInch = 96
+  TextHeight = 21
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 863
+    Height = 30
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 59
+    Caption = 'ToolBar1'
+    Color = clWhite
+    Images = DataLink_BaseInfo.cxImageList_bar
+    List = True
+    ParentColor = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TbSave: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384
+      ImageIndex = 16
+      OnClick = TbSaveClick
+    end
+    object TBClose: TToolButton
+      Left = 63
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object ScrollBox1: TScrollBox [1]
+    Left = 0
+    Top = 30
+    Width = 863
+    Height = 519
+    Align = alClient
+    BevelInner = bvNone
+    BevelOuter = bvNone
+    BorderStyle = bsNone
+    Color = clWhite
+    Ctl3D = False
+    ParentColor = False
+    ParentCtl3D = False
+    TabOrder = 1
+    ExplicitTop = 36
+    object Label2: TLabel
+      Left = 48
+      Top = 73
+      Width = 64
+      Height = 21
+      Caption = #38050#31576#32534#21495
+    end
+    object Label6: TLabel
+      Left = 48
+      Top = 109
+      Width = 106
+      Height = 21
+      Caption = #31576#21495'('#40831'/2'#33521#23544')'
+    end
+    object Label39: TLabel
+      Left = 48
+      Top = 146
+      Width = 91
+      Height = 21
+      Caption = #38050#31576#38271#24230'CM'
+    end
+    object Label7: TLabel
+      Left = 48
+      Top = 230
+      Width = 57
+      Height = 21
+      Caption = #22791'     '#27880
+    end
+    object Label3: TLabel
+      Left = 399
+      Top = 73
+      Width = 64
+      Height = 21
+      Caption = #26550#23376#32534#21495
+    end
+    object Label1: TLabel
+      Left = 399
+      Top = 108
+      Width = 64
+      Height = 21
+      Caption = #26550#23376#23618#21495
+    end
+    object Label4: TLabel
+      Left = 48
+      Top = 186
+      Width = 48
+      Height = 21
+      Caption = #31576#40831#25968
+    end
+    object Label5: TLabel
+      Left = 399
+      Top = 143
+      Width = 32
+      Height = 21
+      Caption = #31576#24133
+    end
+    object Label8: TLabel
+      Left = 647
+      Top = 139
+      Width = 16
+      Height = 21
+      Caption = #8220
+    end
+    object GKKH: TcxTextEdit
+      Tag = 2
+      Left = 159
+      Top = 105
+      Properties.OnChange = JZBHPropertiesChange
+      TabOrder = 1
+      OnExit = GKKHExit
+      Width = 200
+    end
+    object GKBH: TcxTextEdit
+      Tag = 2
+      Left = 159
+      Top = 69
+      Enabled = False
+      TabOrder = 0
+      Text = #33258#21160#29983#25104
+      Width = 200
+    end
+    object GKLength: TcxTextEdit
+      Tag = 2
+      Left = 159
+      Top = 143
+      Properties.OnChange = JZBHPropertiesChange
+      TabOrder = 2
+      Width = 200
+    end
+    object JZBH: TcxTextEdit
+      Tag = 2
+      Left = 469
+      Top = 69
+      Properties.OnChange = JZBHPropertiesChange
+      TabOrder = 3
+      Width = 200
+    end
+    object Note: TcxMemo
+      Tag = 2
+      Left = 159
+      Top = 230
+      TabOrder = 4
+      Height = 77
+      Width = 518
+    end
+    object JZCH: TcxTextEdit
+      Tag = 2
+      Left = 469
+      Top = 104
+      Properties.OnChange = JZBHPropertiesChange
+      TabOrder = 5
+      Width = 200
+    end
+    object GKCS: TcxTextEdit
+      Tag = 2
+      Left = 159
+      Top = 183
+      Properties.OnChange = JZBHPropertiesChange
+      TabOrder = 6
+      OnExit = GKKHExit
+      Width = 200
+    end
+    object GKwidth: TcxTextEdit
+      Tag = 2
+      Left = 469
+      Top = 140
+      Properties.OnChange = JZBHPropertiesChange
+      TabOrder = 7
+      Width = 172
+    end
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_BaseInfo.ADOLink
+    Left = 704
+    Top = 219
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_BaseInfo.ADOLink
+    Left = 706
+    Top = 264
+  end
+  inherited ImageList_new32: TImageList
+    Left = 688
+    Top = 166
+  end
+  inherited cxImageList_bar: TcxImageList
+    FormatVersion = 1
+    Left = 770
+    Top = 88
+    DesignInfo = 5767938
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_BaseInfo.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 747
+    Top = 173
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_BaseInfo.ADOLink
+    Parameters = <>
+    Left = 684
+    Top = 101
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_BaseInfo.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 692
+    Top = 52
+  end
+end

A02基础产品管理/U_GKInput.pas

@@ -0,0 +1,253 @@
+unit U_GKInput;
+
+interface
+
+uses
+  Windows, Messages, StrUtils, SysUtils, Variants, Classes, Graphics, Controls,
+  Forms, Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB,
+  ADODB, cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin,
+  StdCtrls, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
+  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
+  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
+  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
+  cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters,
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore,
+  cxDateUtils, cxImage, cxDBEdit, IdExplicitTLSClientServerBase, cxMemo,
+  U_BaseInput, System.ImageList, Vcl.ImgList, cxImageList, dxSkinsCore,
+  dxSkinsDefaultPainters;
+
+type
+  TfrmGKInput = class(TfrmBaseInput)
+    ToolBar1: TToolBar;
+    TBClose: TToolButton;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    TbSave: TToolButton;
+    ScrollBox1: TScrollBox;
+    Label2: TLabel;
+    Label6: TLabel;
+    Label39: TLabel;
+    GKKH: TcxTextEdit;
+    GKBH: TcxTextEdit;
+    GKLength: TcxTextEdit;
+    Label7: TLabel;
+    JZBH: TcxTextEdit;
+    Label3: TLabel;
+    Note: TcxMemo;
+    Label1: TLabel;
+    JZCH: TcxTextEdit;
+    Label4: TLabel;
+    GKCS: TcxTextEdit;
+    Label5: TLabel;
+    GKwidth: TcxTextEdit;
+    Label8: TLabel;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure TbSaveClick(Sender: TObject);
+    procedure CoareaBtnDnClick(Sender: TObject);
+    procedure JZBHPropertiesChange(Sender: TObject);
+    procedure GKKHExit(Sender: TObject);
+  private
+    { Private declarations }
+    procedure InitGrid();
+    function SaveData(): Boolean;
+  public
+    fFlileFlag: string;
+    fkhType: string;
+    { Public declarations }
+    FGKID: string;
+  end;
+
+var
+  frmGKInput: TfrmGKInput;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel;
+
+{$R *.dfm}
+
+procedure TfrmGKInput.InitGrid();
+begin
+  try
+
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Filtered := False;
+      Close;
+      SQL.Clear;
+      sql.Add(' select * from BS_GK where GKID=''' + Trim(FGKID) + '''');
+      Open;
+    end;
+    SCSHData(ADOQueryMain, ScrollBox1, 2);
+
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmGKInput.JZBHPropertiesChange(Sender: TObject);
+begin
+  inherited;
+  GKBH.Text := JZBH.Text + '-' + GKKH.Text + '-' + JZCH.Text + '-' + GKLength.Text;
+end;
+
+procedure TfrmGKInput.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmGKInput := nil;
+end;
+
+procedure TfrmGKInput.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmGKInput.TBCloseClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmGKInput.FormShow(Sender: TObject);
+begin
+  inherited;
+  InitGrid();
+
+end;
+
+procedure TfrmGKInput.GKKHExit(Sender: TObject);
+var
+  FKCS, FKOUHAO: double;
+begin
+  FKCS := StrToFloatDef(GKCS.Text, 0);
+  FKOUHAO := StrToFloatDef(GKKH.Text, 0);
+  if FKOUHAO <> 0 then
+  begin
+    GKwidth.Text := FloatToStr(RoundFloat(FKCS / FKOUHAO * 2, 2));
+  end;
+
+end;
+
+procedure TfrmGKInput.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+function TfrmGKInput.SaveData(): Boolean;
+var
+  MaxId, MaxSubId, FCoCode, FCCID, MaxCFID: string;
+begin
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    if Trim(FGKID) = '' then
+    begin
+      if GetLSNo(ADOQueryCmd, MaxId, 'GK', 'BS_GK', 4, 1) = False then
+      begin
+        Result := False;
+        ADOQueryCmd.Connection.RollbackTrans;
+        Application.MessageBox('取最大号失败！', '提示', 0);
+        Exit;
+      end;
+
+    end
+    else
+    begin
+      MaxId := Trim(FGKID);
+    end;
+
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add('select * from BS_GK where GKID=''' + Trim(FGKID) + '''');
+      Open;
+    end;
+    with ADOQueryCmd do
+    begin
+      if Trim(FGKID) = '' then
+      begin
+        Append;
+        FieldByName('Filler').Value := Trim(DName);
+      end
+      else
+      begin
+        Edit;
+        FieldByName('Editer').Value := Trim(DName);
+        FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp);
+      end;
+      FieldByName('GKID').Value := Trim(MaxId);
+      RTSetsavedata(ADOQueryCmd, 'BS_GK', ScrollBox1, 2);
+      Post;
+    end;
+
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from BS_GK where GKBH=' + quotedstr(trim(GKBH.Text)));
+      Open;
+    end;
+    if ADOQueryCmd.RecordCount > 1 then
+    begin
+      ADOQueryCmd.Connection.RollbackTrans;
+      Application.MessageBox('钢扣编号重复!', '提示', 0);
+      Exit;
+    end;
+
+    ADOQueryCmd.Connection.CommitTrans;
+    FCCID := Trim(MaxSubId);
+    Result := True;
+  except
+    Result := false;
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox('保存异常!', '提示', 0);
+  end;
+end;
+
+procedure TfrmGKInput.TbSaveClick(Sender: TObject);
+begin
+  if Trim(JZBH.Text) = '' then
+  begin
+    Application.MessageBox('架子编号不能为空!', '提示', 0);
+    Exit;
+  end
+  else if Trim(GKKH.Text) = '' then
+  begin
+    Application.MessageBox('筘号不能为空!', '提示', 0);
+    Exit;
+  end
+  else if Trim(JZCH.Text) = '' then
+  begin
+    Application.MessageBox('架子层号不能为空!', '提示', 0);
+    Exit;
+  end
+  else if Trim(GKLength.Text) = '' then
+  begin
+    Application.MessageBox('钢筘长度不能为空!', '提示', 0);
+    Exit;
+  end;
+
+  if SaveData() then
+  begin
+    Application.MessageBox('保存成功!', '提示', 0);
+    ModalResult := 1;
+  end;
+end;
+
+procedure TfrmGKInput.CoareaBtnDnClick(Sender: TObject);
+begin
+  TBtnEditC(Sender).Text := '';
+  TBtnEditC(Sender).TxtCode := '';
+end;
+
+end.
+

A02基础产品管理/U_GKManageSel.dfm

@@ -0,0 +1,301 @@
+inherited frmGKManageSel: TfrmGKManageSel
+  Left = 297
+  Top = 109
+  Caption = #38050#25187#20449#24687#36873#25321
+  ClientHeight = 523
+  ClientWidth = 1461
+  KeyPreview = True
+  ExplicitWidth = 1477
+  ExplicitHeight = 562
+  PixelsPerInch = 96
+  TextHeight = 17
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1461
+    Height = 38
+    AutoSize = True
+    ButtonHeight = 38
+    ButtonWidth = 75
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Images = DataLink_WarpBeamStk.ImageList_new32
+    List = True
+    ParentColor = False
+    ShowCaptions = True
+    TabOrder = 3
+    object ToolButton1: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #36873#25321
+      ImageIndex = 12
+      OnClick = ToolButton1Click
+    end
+    object TBRafresh: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object TbFilter: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      Visible = False
+    end
+    object ToolButton2: TToolButton
+      Left = 213
+      Top = 0
+      AutoSize = True
+      Caption = #26032#22686
+      ImageIndex = 2
+      OnClick = ToolButton2Click
+    end
+    object ToolButton3: TToolButton
+      Left = 284
+      Top = 0
+      AutoSize = True
+      Caption = #20462#25913
+      ImageIndex = 3
+      OnClick = ToolButton3Click
+    end
+    object ToolButton4: TToolButton
+      Left = 355
+      Top = 0
+      AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 14
+      OnClick = ToolButton4Click
+    end
+    object TBClose: TToolButton
+      Left = 426
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object cxGrid2: TcxGrid [1]
+    Left = 0
+    Top = 81
+    Width = 1461
+    Height = 442
+    Align = alClient
+    PopupMenu = PopupMenu1
+    TabOrder = 2
+    object Tv2: TcxGridDBTableView
+      OnDblClick = Tv2DblClick
+      Navigator.Buttons.CustomButtons = <>
+      Navigator.Buttons.Delete.Enabled = False
+      Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DS_HZ
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skCount
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsCustomize.ColumnFiltering = False
+      OptionsData.Deleting = False
+      OptionsData.DeletingConfirmation = False
+      OptionsData.Editing = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      object Tv2Column4: TcxGridDBColumn
+        Caption = #38050#31576#32534#21495
+        DataBinding.FieldName = 'GKBH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 100
+      end
+      object Tv2Column1: TcxGridDBColumn
+        Caption = #26550#23376#32534#21495
+        DataBinding.FieldName = 'JZBH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
+      object Tv2Column3: TcxGridDBColumn
+        Caption = #26550#23376#23618#21495
+        DataBinding.FieldName = 'JZCH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
+      object Tv2Column5: TcxGridDBColumn
+        Caption = #31576#21495'('#40831'/2'#33521#23544')'
+        DataBinding.FieldName = 'GKKH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 124
+      end
+      object Tv2Column6: TcxGridDBColumn
+        Caption = #38050#31576#38271#24230'CM'
+        DataBinding.FieldName = 'GKLength'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
+      object Tv2Column2: TcxGridDBColumn
+        Caption = #31576#40831#25968
+        DataBinding.FieldName = 'GKCS'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 71
+      end
+      object Tv2Column8: TcxGridDBColumn
+        Caption = #31576#24133
+        DataBinding.FieldName = 'GKwidth'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 72
+      end
+      object Tv2Column10: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 100
+      end
+      object Tv2Column7: TcxGridDBColumn
+        Caption = #24211#23384#25968#37327
+        DataBinding.FieldName = 'kcqty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = Tv2
+    end
+  end
+  object Panel1: TPanel [2]
+    Left = 0
+    Top = 38
+    Width = 1461
+    Height = 43
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clWhite
+    ParentBackground = False
+    TabOrder = 4
+    object Label1: TLabel
+      Left = 13
+      Top = 11
+      Width = 48
+      Height = 17
+      Caption = #38050#25187#32534#21495
+    end
+    object GKBH: TcxTextEdit
+      Tag = 2
+      Left = 83
+      Top = 6
+      ParentColor = True
+      Properties.OnChange = MCNOPropertiesChange
+      TabOrder = 0
+      Width = 158
+    end
+  end
+  inherited loadProcess: TPanel
+    Left = 316
+    Top = 411
+    ExplicitLeft = 316
+    ExplicitTop = 411
+  end
+  inherited cxProgressBar2: TcxProgressBar
+    Left = 316
+    Top = 356
+    ExplicitLeft = 316
+    ExplicitTop = 356
+    ExplicitHeight = 25
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    Left = 113
+    Top = 256
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    Left = 137
+    Top = 169
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 459
+    Top = 169
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    Parameters = <>
+    Left = 357
+    Top = 153
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 253
+    Top = 161
+  end
+  object GPM_1: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 520
+    Top = 264
+  end
+  object DS_HZ: TDataSource
+    DataSet = CDS_HZ
+    Left = 283
+    Top = 259
+  end
+  object CDS_HZ: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 429
+    Top = 271
+  end
+  object PopupMenu1: TPopupMenu
+    Left = 355
+    Top = 250
+    object N1: TMenuItem
+      Caption = #20840#36873
+      OnClick = N1Click
+    end
+    object N2: TMenuItem
+      Caption = #20840#24323
+      OnClick = N2Click
+    end
+  end
+end

A02基础产品管理/U_GKManageSel.pas

@@ -0,0 +1,262 @@
+unit U_GKManageSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
+  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
+  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
+  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
+  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
+  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
+  cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
+  dxBarBuiltInMenu, U_BaseList, RM_BarCode, dxScrollbarAnnotations, cxContainer,
+  cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters;
+
+type
+  TfrmGKManageSel = class(TfrmBaseList)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBClose: TToolButton;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    TbFilter: TToolButton;
+    ADOQueryMain: TADOQuery;
+    cxGrid2: TcxGrid;
+    Tv2: TcxGridDBTableView;
+    cxGridLevel1: TcxGridLevel;
+    GPM_1: TcxGridPopupMenu;
+    DS_HZ: TDataSource;
+    CDS_HZ: TClientDataSet;
+    PopupMenu1: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    Panel1: TPanel;
+    Label1: TLabel;
+    GKBH: TcxTextEdit;
+    Tv2Column4: TcxGridDBColumn;
+    Tv2Column10: TcxGridDBColumn;
+    Tv2Column1: TcxGridDBColumn;
+    Tv2Column3: TcxGridDBColumn;
+    Tv2Column5: TcxGridDBColumn;
+    Tv2Column6: TcxGridDBColumn;
+    Tv2Column7: TcxGridDBColumn;
+    ToolButton1: TToolButton;
+    Tv2Column2: TcxGridDBColumn;
+    Tv2Column8: TcxGridDBColumn;
+    ToolButton2: TToolButton;
+    ToolButton3: TToolButton;
+    ToolButton4: TToolButton;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure cxTabControl1Change(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+    procedure N2Click(Sender: TObject);
+    procedure CustomerChange(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure MCNOPropertiesChange(Sender: TObject);
+    procedure Tv2DblClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+    procedure ToolButton4Click(Sender: TObject);
+
+  private
+    { Private declarations }
+    procedure InitGrid();
+  public
+    fFlag: integer;
+    { Public declarations }
+    RKFlag, FCYID, fmanage: string;
+  end;
+
+var
+  frmGKManageSel: TfrmGKManageSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint, U_EmployeeSel, U_GKInput;
+
+{$R *.dfm}
+
+procedure TfrmGKManageSel.InitGrid();
+begin
+  GKBH.SetFocus;
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add(' select A.*,kcqty=( select sum(IOQtyFlag*qty) from Bs_Product_IO e where e.p_code=a.gkbh and stkname=''物料'') from  BS_GK A  ');
+//      showmessage(Sql.text);
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, CDS_HZ);
+    SInitCDSData(ADOQueryMain, CDS_HZ);
+  finally
+    ADOQueryMain.EnableControls;
+    TbFilter.Click;
+  end;
+end;
+
+procedure TfrmGKManageSel.MCNOPropertiesChange(Sender: TObject);
+var
+  sql: string;
+begin
+  if ADOQueryMain.Active then
+  begin
+    sql := SGetFilters(Panel1, 1, 2);
+    SDofilter(ADOQueryMain, sql);
+    SCreateCDS(ADOQueryMain, CDS_HZ);
+    SInitCDSData(ADOQueryMain, CDS_HZ);
+  end;
+end;
+
+procedure TfrmGKManageSel.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmGKManageSel := nil;
+end;
+
+procedure TfrmGKManageSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmGKManageSel.TBCloseClick(Sender: TObject);
+begin
+  WriteCxGrid(Trim(Self.Caption), Tv2, '钢扣信息选择');
+  Close;
+end;
+
+procedure TfrmGKManageSel.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid(Trim(Self.Caption), Tv2, '钢扣信息选择');
+  InitGrid();
+end;
+
+procedure TfrmGKManageSel.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmGKManageSel.ToolButton1Click(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    exit;
+  ModalResult := 1;
+end;
+
+procedure TfrmGKManageSel.ToolButton2Click(Sender: TObject);
+begin
+  try
+    frmGKInput := TfrmGKInput.Create(Application);
+    with frmGKInput do
+    begin
+      FGKID := '';
+      if ShowModal = 1 then
+      begin
+        InitGrid();
+      end;
+    end;
+  finally
+    frmGKInput.Free;
+  end;
+end;
+
+procedure TfrmGKManageSel.ToolButton3Click(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    exit;
+  try
+    frmGKInput := TfrmGKInput.Create(Application);
+    with frmGKInput do
+    begin
+      FGKID := Trim(Self.CDS_HZ.fieldbyname('GKID').AsString);
+      if ShowModal = 1 then
+      begin
+
+      end;
+    end;
+  finally
+    frmGKInput.Free;
+  end;
+end;
+
+procedure TfrmGKManageSel.ToolButton4Click(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    Exit;
+
+  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('delete BS_GK where GKID=' + QuotedStr(CDS_HZ.FieldByName('GKID').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('GKID：' + trim(CDS_HZ.FieldByName('GKID').AsString) + ';GKno:' + trim(CDS_HZ.FieldByName('GKBH').AsString))));
+    sql.Add(',' + quotedstr(trim('成功')));
+    sql.Add(')');
+    ExecSQL;
+  end;
+
+  InitGrid();
+
+end;
+
+procedure TfrmGKManageSel.Tv2DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmGKManageSel.cxTabControl1Change(Sender: TObject);
+begin
+  InitGrid;
+end;
+
+procedure TfrmGKManageSel.N1Click(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    exit;
+  SelOKNo(CDS_HZ, True);
+end;
+
+procedure TfrmGKManageSel.N2Click(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    exit;
+  SelOKNo(CDS_HZ, False);
+end;
+
+procedure TfrmGKManageSel.CustomerChange(Sender: TObject);
+begin
+  TbFilter.Click;
+end;
+
+procedure TfrmGKManageSel.FormCreate(Sender: TObject);
+begin
+  inherited;
+  fmanage := Trim(DParameters1);
+end;
+
+end.
+

A02基础产品管理/U_TatClothInfoInput.dfm

@@ -20,7 +20,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 99
+    ButtonWidth = 83
     Caption = 'ToolBar1'
     Color = clWhite
     Images = DataLink_ClothInfo.cxImageList_bar
@@ -38,7 +38,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
       OnClick = ToolButton1Click
     end
     object ToolButton6: TToolButton
-      Left = 71
+      Left = 63
       Top = 0
       AutoSize = True
       Caption = #38468#20214
@@ -47,7 +47,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
       OnClick = ToolButton6Click
     end
     object ToolButton11: TToolButton
-      Left = 142
+      Left = 126
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -55,7 +55,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
       OnClick = ToolButton11Click
     end
     object TBClose: TToolButton
-      Left = 245
+      Left = 213
       Top = 0
       AutoSize = True
       Caption = #20851#38381

A02基础产品管理/U_TatClothInfoInput.pas

@@ -747,6 +747,7 @@ begin
   InitImage();
 end;
 
+
 procedure TfrmTatClothInfoInput.TBCloseClick(Sender: TObject);
 begin
   Close;

A02基础产品管理/U_TatGYSel.pas

@@ -0,0 +1,216 @@
+unit U_TatGYSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, ToolWin, ComCtrls, U_BaseHelp, cxGridCustomTableView,
+  cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
+  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
+  cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
+  System.ImageList, U_BaseInput, cxCheckBox, cxCalendar, dxScrollbarAnnotations,
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinOffice2013White, dxSkinSharpPlus,
+  dxSkinWXI;
+
+type
+  TfrmTatGYSel = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    TBSave: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    ADOConnection1: TADOConnection;
+    Panel1: TPanel;
+    GPM_1: TcxGridPopupMenu;
+    ImageList1: TImageList;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
+    Label3: TLabel;
+    Label2: TLabel;
+    Label4: TLabel;
+    Label5: TLabel;
+    Label6: TLabel;
+    Label7: TLabel;
+    Label8: TLabel;
+    Label1: TLabel;
+    OrderNo: TEdit;
+    C_Name: TEdit;
+    C_Color: TEdit;
+    C_ColorNo: TEdit;
+    C_Pattern: TEdit;
+    C_Code: TEdit;
+    ConNo: TEdit;
+    CustName: TEdit;
+    Label9: TLabel;
+    XH: TEdit;
+    Label10: TLabel;
+    OrdNote: TEdit;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v1OrderNo: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    v1Column31: TcxGridDBColumn;
+    v1Column5: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    v1Column19: TcxGridDBColumn;
+    v1Column21: TcxGridDBColumn;
+    v1Column2: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    v1PRTKZ: TcxGridDBColumn;
+    v1Column3: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    v1Column7: TcxGridDBColumn;
+    v1PRTMF: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column11: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column16: TcxGridDBColumn;
+    v1Column4: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    Tv1Column7: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    procedure FormCreate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure TBSaveClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure OrderNoChange(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure Tv1DblClick(Sender: TObject);
+  private
+    procedure InitGrid();
+    { Private declarations }
+  public
+    FCoType, FAuthority: string;
+    { Public declarations }
+  end;
+
+var
+  frmTatGYSel: TfrmTatGYSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmTatGYSel.FormCreate(Sender: TObject);
+begin
+  inherited;
+  try
+    with ADOConnection1 do
+    begin
+      Connected := false;
+      ConnectionString := DConString;
+      Connected := true;
+    end;
+    ADOQueryBaseCmd.Connection := ADOConnection1;
+    ADOQueryBaseTemp.Connection := ADOConnection1;
+  except
+    application.MessageBox('网络连接失败！', '提示信息');
+  end;
+end;
+
+procedure TfrmTatGYSel.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmTatGYSel := nil;
+end;
+
+procedure TfrmTatGYSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  Action := cahide;
+end;
+
+procedure TfrmTatGYSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add(' select *,PZQty=(select count(*) from Tat_WB_Card X where X.OrderNo =A.OrderNo)');
+      sql.Add(',ZS=(select ZS from Bs_Cloth_Info X where X.C_Code =B.C_Code)  ');
+      sql.Add(' from Tat_Plan_Main A inner join Tat_Plan_Sub B on A.MainId=B.MainId');
+      sql.Add(' where  isnull(A.status,''0'')=''22'' ');
+
+//      ShowMessage(sql.Text);
+      Open;
+    end;
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmTatGYSel.OrderNoChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  end;
+end;
+
+procedure TfrmTatGYSel.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid('单位名称1' + Trim(FCoType), TV1, '自定义数据');
+  InitGrid();
+end;
+
+procedure TfrmTatGYSel.TBCloseClick(Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfrmTatGYSel.TBSaveClick(Sender: TObject);
+begin
+  WriteCxGrid('单位名称1' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmTatGYSel.ToolButton1Click(Sender: TObject); //选择
+begin
+  if (ADOQueryMain.IsEmpty) or (CDS_1.IsEmpty) then
+  begin
+    ShowMessage('请先选择数据行！');
+    Exit;
+  end;
+  if (ADOQueryMain.FieldByName('C_Code').AsString = '') or (ADOQueryMain.FieldByName('C_Code').IsNull) then
+  begin
+    ShowMessage('请先选择产品信息！');
+    Exit;
+  end;
+  if (ADOQueryMain.FieldByName('C_Name').AsString = '') or (ADOQueryMain.FieldByName('C_Name').IsNull) then
+  begin
+    ShowMessage('请先选择产品信息！');
+    Exit;
+  end;
+  ModalResult := 1;
+end;
+
+procedure TfrmTatGYSel.Tv1DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+end.
+

A02基础产品管理/U_WBSpecInPut.pas

@@ -11,8 +11,9 @@ uses
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
   dxBarBuiltInMenu, U_BaseInput, U_BaseList, System.ImageList, Vcl.ImgList,
-  cxMemo, dxScrollbarAnnotations, cxContainer, cxImageList, dxSkinsCore,
+  cxMemo, dxScrollbarAnnotations, cxContainer, dxSkinsCore,
-  dxSkinsDefaultPainters;
+  dxSkinsDefaultPainters, cxImageList, dxSkinOffice2013White, dxSkinSharpPlus,
+  dxSkinWXI, cxMaskEdit, cxGroupBox, MATH, Vcl.Menus;
 
 type
   TfrmWBSpecInPut = class(TfrmBaseInput)
@@ -39,51 +40,70 @@ type
     ToolButton1: TToolButton;
     Tv1Column1: TcxGridDBColumn;
     ScrollBox1: TScrollBox;
-    Label7: TLabel;
     Label3: TLabel;
     WB_Code: TcxTextEdit;
     ToolBar2: TToolBar;
     ToolButton3: TToolButton;
     ToolButton4: TToolButton;
-    Label4: TLabel;
     Label8: TLabel;
     WB_YarnQty: TcxTextEdit;
-    WB_Move: TcxTextEdit;
     Tv1Column2: TcxGridDBColumn;
     Label1: TLabel;
     Label2: TLabel;
     WB_Name: TcxTextEdit;
     WB_ReedNote: TcxTextEdit;
     Label5: TLabel;
-    WB_YarnArr: TcxTextEdit;
+    BSQTY: TcxTextEdit;
-    Label6: TLabel;
-    WB_YarnStripRemainder: TcxTextEdit;
-    Label9: TLabel;
-    WB_YarnStripQty: TcxTextEdit;
     Label10: TLabel;
     WB_ReedNo: TcxTextEdit;
-    Label11: TLabel;
-    WB_Width: TcxTextEdit;
     Label12: TLabel;
-    WB_YarnLen: TcxTextEdit;
+    C_KCQTY: TcxTextEdit;
+    Tv1Column3: TcxGridDBColumn;
+    btn1: TToolButton;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column7: TcxGridDBColumn;
+    Label18: TLabel;
+    ISSizing: TcxComboBox;
+    Tv1Column8: TcxGridDBColumn;
+    Label19: TLabel;
+    GKBH: TcxButtonEdit;
+    Tv1Column9: TcxGridDBColumn;
+    Label20: TLabel;
+    WB_TYPE: TcxComboBox;
+    Label4: TLabel;
+    WB_Width: TcxTextEdit;
+    cxGroupBox1: TcxGroupBox;
+    Label6: TLabel;
+    F_MAXKESHU: TcxTextEdit;
+    Label7: TLabel;
+    F_YarnStripQty: TcxTextEdit;
+    Label9: TLabel;
+    F_SJKESHU: TcxTextEdit;
+    Label11: TLabel;
+    F_YUSHU: TcxTextEdit;
+    cxGroupBox2: TcxGroupBox;
     Label13: TLabel;
     Label14: TLabel;
     Label15: TLabel;
-    WB_Arg_SDWZ: TcxTextEdit;
-    WB_Arg_PXDS: TcxTextEdit;
     Label16: TLabel;
-    WB_Arg_QJZL: TcxTextEdit;
+    Z_MAXKESHU: TcxTextEdit;
-    Tv1Column3: TcxGridDBColumn;
+    Z_FENJIAO: TcxTextEdit;
-    WB_YarnArrNote: TcxMemo;
+    Z_FJGENSHU: TcxTextEdit;
-    Note: TcxMemo;
+    Z_BINGSHU: TcxTextEdit;
-    btn1: TToolButton;
-    Tv1Column4: TcxGridDBColumn;
     Label17: TLabel;
-    WB_YarnDensity: TcxTextEdit;
+    Label21: TLabel;
-    Tv1Column5: TcxGridDBColumn;
+    Z_SJKESHU1: TcxTextEdit;
-    Tv1Column6: TcxGridDBColumn;
+    Z_ZHOUSHU1: TcxTextEdit;
-    ADOConnection1: TADOConnection;
+    Label22: TLabel;
-    Tv1Column7: TcxGridDBColumn;
+    Label23: TLabel;
+    Z_SJKESHU2: TcxTextEdit;
+    Z_ZHOUSHU2: TcxTextEdit;
+    ToolButton2: TToolButton;
+    PopupMenu1: TPopupMenu;
+    N1: TMenuItem;
+    Label24: TLabel;
+    DCRQTY: TcxTextEdit;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBAddClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -93,10 +113,22 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure btn1Click(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
+    procedure GYNoDblClick(Sender: TObject);
+    procedure GKBHPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure v1Column3PropertiesEditValueChanged(Sender: TObject);
+    procedure WB_YarnQtyPropertiesEditValueChanged(Sender: TObject);
+    procedure WB_YarnQtyExit(Sender: TObject);
+
+    procedure Tv1Column8PropertiesEditValueChanged(Sender: TObject);
+    procedure WB_TYPEPropertiesChange(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure N1Click(Sender: TObject);
   private
     { Private declarations }
     function SaveData(): Boolean;
+    procedure JSJS(); //计算经丝
+
+    procedure JS(); //计算经丝
   public
     { Public declarations }
     FWBSID, FSTKName: string;
@@ -108,10 +140,159 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_YarnInfoSel, U_TatClothInfoSel;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_YarnInfoSel, U_TatClothInfoSel, U_TatGYSel,
+  U_CompanySel, U_GKManageSel;
 
 {$R *.dfm}
 
+procedure TfrmWBSpecInPut.JS();
+var
+  FZGS, FF_MAXKESHU: double;
+  fTS, FSJKS, FFJ, FF_MAXKESHU2, ffjgs, fbs: Integer;
+  FSJKS1, FSJKZ2, FXZS1, FXZS2: Integer;
+begin
+//总经根数/纱架最大挂纱数 向上取整=条数
+//  总经根数/条数 向下取整=颗数
+//  总经根数-条数*颗数 取余整=余数
+  FZGS := STRTOFLOATDEF(WB_YarnQty.Text, 0);
+  FF_MAXKESHU := STRTOFLOATDEF(F_MAXKESHU.Text, 0);
+  if (FF_MAXKESHU <> 0) and (FZGS <> 0) then
+  begin
+    fTS := Ceil(FZGS / FF_MAXKESHU);
+    F_YarnStripQty.Text := INTTOSTR(fTS);
+    FSJKS := Floor(FZGS / fTS);
+    F_SJKESHU.Text := INTTOSTR(FSJKS);
+    F_YUSHU.Text := FLOATTOSTR(FZGS - FSJKS * fTS);
+  end
+  else
+  begin
+    Exit;
+  end;
+
+      // 总经根数/分交  向上取整=分绞根数
+      // 分交根数/ 纱架最大挂纱数 向上取整=并数
+      //  分交根数/并数 向下取整=上稀轴数
+      //  分交根数- （分交根数/并数 向下取整）*6=下稀轴数
+  FFJ := StrToIntdef(Z_FENJIAO.Text, 0);
+  FF_MAXKESHU2 := STRTOintDEF(Z_MAXKESHU.Text, 0);
+  if (FFJ <> 0) and (FF_MAXKESHU2 <> 0) then
+  begin
+    ffjgs := Ceil(FZGS / FFJ);
+    Z_FJGENSHU.Text := inttostr(ffjgs);
+    fbs := Ceil(ffjgs / FF_MAXKESHU2);
+    Z_BINGSHU.Text := inttostr(fbs);
+    FSJKS1 := Floor(ffjgs / fbs);
+    if FSJKS1 * fbs = ffjgs then
+    begin
+      Z_SJKESHU1.Text := inttostr(FSJKS1);
+      Z_ZHOUSHU1.Text := inttostr(fbs);
+      Z_SJKESHU2.Text := '0';
+      Z_ZHOUSHU2.Text := '0';
+    end
+    else
+    begin
+      Z_SJKESHU1.Text := inttostr(FSJKS1);
+      Z_ZHOUSHU1.Text := inttostr(fbs - 1);
+      Z_SJKESHU2.Text := inttostr(ffjgs - (FSJKS1 * (fbs - 1)));
+      Z_ZHOUSHU2.Text := '1';
+    end;
+
+  end;
+end;
+
+procedure TfrmWBSpecInPut.JSJS();
+var
+  GS, ZGS, MF, DS, WM, TW: double;
+begin
+  if CDS_SUB.IsEmpty then
+    exit;
+  with CDS_SUB do
+  begin
+    DisableControls;
+    first;
+    while not eof do
+    begin
+
+      with CDS_SUB do
+      begin
+
+        if FieldByName('YarnQty').Value = null then
+        begin
+          GS := 0;   //根数
+        end
+        else
+        begin
+          GS := FieldByName('YarnQty').Value;   //根数
+        end;
+
+        if FieldByName('CycleYarnQty').Value = null then
+        begin
+          ZGS := 0; //循环根数
+        end
+        else
+        begin
+          ZGS := FieldByName('CycleYarnQty').Value; //循环根数
+        end;
+
+        MF := strtofloatdef(WB_Width.text, 0);    //筘幅
+
+        TW := strtofloatdef(WB_YarnQty.text, 0);    //头纹
+
+        if FieldByName('TestDenier').Value = null then
+        begin
+          DS := 0;     //D数
+        end
+        else
+        begin
+          DS := FieldByName('TestDenier').Value;     //D数
+        end;
+
+      end;
+      if ZGS <> 0 then
+      begin
+        with CDS_SUB do
+        begin
+          Edit;
+          FieldByName('MeterQty').Value := roundfloat(GS / ZGS * TW * DS / 9000, 2);
+          Post;
+        end;
+      end;
+      next;
+    end;
+    First;
+    EnableControls;
+  end;
+end;
+
+procedure TfrmWBSpecInPut.N1Click(Sender: TObject);
+var
+  I, J: Integer;
+  AField: TField;
+begin
+  with tv1 do
+  begin
+    // 遍历所有选中行
+
+    DataController.DataSource.Dataset.Edit; // 进入编辑模式
+
+      // 遍历所有字段列
+    for J := 0 to ColumnCount - 1 do
+    begin
+        // 获取当前列的字段
+      AField := Columns[J].DataBinding.Field;
+
+        // 检查字段存在且不是 RowNo 列
+      if (AField <> nil) and (CompareText(AField.FieldName, 'RowNo') <> 0) and (CompareText(Columns[J].Name, 'RowNo') <> 0) then // 双重检查确保排除
+      begin
+        AField.Clear; // 清空字段值
+      end;
+    end;
+
+    DataController.DataSource.Dataset.Post; // 提交修改
+
+  end;
+end;
+
 procedure TfrmWBSpecInPut.btn1Click(Sender: TObject);
 begin
   try
@@ -164,23 +345,6 @@ begin
   Action := caFree;
 end;
 
-procedure TfrmWBSpecInPut.FormCreate(Sender: TObject);
-begin
-  inherited;
-  try
-    with ADOConnection1 do
-    begin
-      Connected := false;
-      ConnectionString := DConString;
-      Connected := true;
-    end;
-    ADOQueryBaseCmd.Connection := ADOConnection1;
-    ADOQueryBaseTemp.Connection := ADOConnection1;
-  except
-    application.MessageBox('网络连接失败！', '提示信息');
-  end;
-end;
-
 procedure TfrmWBSpecInPut.TBAddClick(Sender: TObject);
 begin
   try
@@ -197,6 +361,7 @@ begin
           FieldByName('Y_Code').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Code').value;
           FieldByName('Y_Name').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Name').value;
           FieldByName('Y_Spec').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Spec').value;
+
           FieldByName('FF').Value := frmYarnInfoSel.CDS_1.fieldbyname('FF').value;
           FieldByName('ND').Value := frmYarnInfoSel.CDS_1.fieldbyname('ND').value;
           FieldByName('Denier').Value := frmYarnInfoSel.CDS_1.fieldbyname('Denier').value;
@@ -251,6 +416,8 @@ begin
       end;
       FieldByName('WBSID').Value := Trim(MaxNo);
       RTSetsavedata(ADOQueryCmd, 'Tat_WB_Spec', ScrollBox1, 2);
+      RTSetsavedata(ADOQueryCmd, 'Tat_WB_Spec', cxGroupBox1, 2);
+      RTSetsavedata(ADOQueryCmd, 'Tat_WB_Spec', cxGroupBox2, 2);
       Post;
     end;
 
@@ -367,7 +534,19 @@ begin
     Open;
   end;
   SCSHData(ADOQueryTemp, ScrollBox1, 2);
+  SCSHData(ADOQueryTemp, cxGroupBox1, 2);
+  SCSHData(ADOQueryTemp, cxGroupBox2, 2);
 
+  if WB_TYPE.Text = '整浆并' then
+  begin
+    cxGroupBox2.Visible := True;
+    cxGroupBox1.Visible := false;
+  end
+  else
+  begin
+    cxGroupBox2.Visible := false;
+    cxGroupBox1.Visible := True;
+  end;
   with ADOQueryTemp do
   begin
     Close;
@@ -386,29 +565,67 @@ begin
       Append;
       FieldByName('RowNo').Value := 'A';
       Post;
+
       Append;
       FieldByName('RowNo').Value := 'B';
       Post;
+
       Append;
       FieldByName('RowNo').Value := 'C';
       Post;
+
       Append;
       FieldByName('RowNo').Value := 'D';
       Post;
+
       Append;
       FieldByName('RowNo').Value := 'E';
       Post;
+
       Append;
       FieldByName('RowNo').Value := 'F';
       Post;
+
       Append;
       FieldByName('RowNo').Value := 'G';
       Post;
+
+      Append;
+      FieldByName('RowNo').Value := 'H';
+      Post;
+
     end;
   end;
 
 end;
 
+procedure TfrmWBSpecInPut.GKBHPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmGKManageSel := tfrmGKManageSel.Create(Application);
+    with frmGKManageSel do
+    begin
+
+      if ShowModal = 1 then
+      begin
+        SELF.GKBH.Text := CDS_HZ.FieldByName('GKBH').AsString;
+        SELF.WB_ReedNo.Text := CDS_HZ.FieldByName('GKKH').AsString;
+        SELF.C_KCQTY.Text := CDS_HZ.FieldByName('GKCS').AsString;
+        SELF.WB_Width.Text := CDS_HZ.FieldByName('GKwidth').AsString;
+      end;
+    end;
+  finally
+    frmGKManageSel.Free;
+  end;
+end;
+
+procedure TfrmWBSpecInPut.GYNoDblClick(Sender: TObject);
+begin
+  inherited;
+  TcxButtonEdit(Sender).Properties.LookupItems.Text := '';
+  TcxButtonEdit(Sender).Text := '';
+end;
+
 procedure TfrmWBSpecInPut.TBDelClick(Sender: TObject);
 begin
   if CDS_Sub.IsEmpty then
@@ -446,43 +663,33 @@ end;
 procedure TfrmWBSpecInPut.TBSaveClick(Sender: TObject);
 begin
   ToolBar1.SetFocus;
-  if StrToFloatDef(WB_YarnDensity.Text, 0) = 0 then
-  begin
-    Application.MessageBox('请填写正确的经密!', '提示', 0);
-    Exit;
-  end;
-  if StrToFloatDef(WB_Width.Text, 0) = 0 then
-  begin
-    Application.MessageBox('请填写正确的经轴门幅!', '提示', 0);
-    Exit;
-  end;
 
-  with CDS_Sub do
+//  with CDS_Sub do
-  begin
+//  begin
-    CDS_Sub.First;
+//    CDS_Sub.First;
-    while not Eof do
+//    while not Eof do
-    begin
+//    begin
-      if trim(CDS_Sub.fieldbyname('Y_Code').asstring) <> '' then
+//      if trim(CDS_Sub.fieldbyname('Y_Code').asstring) <> '' then
-      begin
+//      begin
-        if StrToFloatDef(Trim(CDS_Sub.fieldbyname('YarnQty').AsString), 0) = 0 then
+//        if StrToFloatDef(Trim(CDS_Sub.fieldbyname('YarnQty').AsString), 0) = 0 then
-        begin
+//        begin
-          Application.MessageBox('根数不能为空!', '提示', 0);
+//          Application.MessageBox('根数不能为空!', '提示', 0);
-          Exit;
+//          Exit;
-        end;
+//        end;
-      end;
+//      end;
-
+//
-      if trim(CDS_Sub.fieldbyname('Y_Code').asstring) <> '' then
+//      if trim(CDS_Sub.fieldbyname('Y_Code').asstring) <> '' then
-      begin
+//      begin
-        if StrToFloatDef(Trim(CDS_Sub.fieldbyname('CycleYarnQty').AsString), 0) = 0 then
+//        if StrToFloatDef(Trim(CDS_Sub.fieldbyname('CycleYarnQty').AsString), 0) = 0 then
-        begin
+//        begin
-          Application.MessageBox('循环根数不能为空!', '提示', 0);
+//          Application.MessageBox('循环根数不能为空!', '提示', 0);
-          Exit;
+//          Exit;
-        end;
+//        end;
-      end;
+//      end;
-
+//
-      CDS_Sub.Next;
+//      CDS_Sub.Next;
-    end;
+//    end;
-  end;
+//  end;
 
   if SaveData() then
   begin
@@ -497,6 +704,31 @@ begin
   WriteCxGrid(trim(self.Caption), Tv1, '¾­¹æ¸ñ²Ö¿â');
 end;
 
+procedure TfrmWBSpecInPut.ToolButton2Click(Sender: TObject);
+var
+  I, J: Integer;
+begin
+  // 确保引用的是正确的视图（如 TcxGridDBTableView）
+  with TV1 do
+  begin
+    // 遍历所有选中行
+//    for I := 0 to SelectedRowCount - 1 do
+//    begin
+      // 获取数据集记录
+    DataController.DataSource.Dataset.Edit; // 进入编辑模式
+      // 遍历所有字段列
+    for J := 0 to ColumnCount - 1 do
+    begin
+        // 清空字段值（跳过只读/关键字段）
+      if Columns[J].DataBinding.Field <> nil then
+        Columns[J].DataBinding.Field.Clear;
+    end;
+    DataController.DataSource.Dataset.Post; // 提交修改
+//    end;
+  end;
+
+end;
+
 procedure TfrmWBSpecInPut.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
@@ -513,9 +745,11 @@ begin
           FieldByName('Y_Code').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Code').value;
           FieldByName('Y_Name').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Name').value;
           FieldByName('Y_Spec').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Spec').value;
+
           FieldByName('FF').Value := frmYarnInfoSel.CDS_1.fieldbyname('FF').value;
           FieldByName('ND').Value := frmYarnInfoSel.CDS_1.fieldbyname('ND').value;
           FieldByName('Denier').Value := frmYarnInfoSel.CDS_1.fieldbyname('Denier').value;
+          FieldByName('ZS').Value := frmYarnInfoSel.CDS_1.fieldbyname('ZS').value;
           FieldByName('Y_Ratio').Value := 0;
         end;
       end;
@@ -525,5 +759,130 @@ begin
   end;
 end;
 
+procedure TfrmWBSpecInPut.Tv1Column8PropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue, FFieldName: string;
+  ZS, ZGS: double;
+begin
+
+  mvalue := TcxTextEdit(Sender).EditingText;
+  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
+
+  with CDS_SUB do
+  begin
+    Edit;
+    FieldByName(FFieldName).Value := mvalue;
+    Post;
+
+    if FieldByName('QFYARNQTY').Value = null then
+    begin
+      ZGS := 0;   //QUANFU根数
+    end
+    else
+    begin
+      ZGS := FieldByName('QFYARNQTY').Value;   //全服根数
+    end;
+
+    if FieldByName('ZS').Value = null then
+    begin
+      ZS := 0; //循环根数
+    end
+    else
+    begin
+      ZS := FieldByName('ZS').Value; //循环根数
+    end;
+
+  end;
+  if ZS <> 0 then
+  begin
+    with CDS_SUB do
+    begin
+      Edit;
+      FieldByName('MeterQty').Value := roundfloat(ZGS * 0.059 / ZS * 1.08, 2);
+      Post;
+    end;
+  end;
+end;
+
+procedure TfrmWBSpecInPut.v1Column3PropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue, FFieldName: string;
+  GS, ZGS, MF, DS, WM, TW, SUNHAO: double;
+begin
+
+  mvalue := TcxTextEdit(Sender).EditingText;
+  FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
+
+//  with CDS_SUB do
+//  begin
+//    Edit;
+//    FieldByName(FFieldName).Value := mvalue;
+//    Post;
+//
+//    if FieldByName('YarnQty').Value = null then
+//    begin
+//      GS := 0;   //根数
+//    end
+//    else
+//    begin
+//      GS := FieldByName('YarnQty').Value;   //根数
+//    end;
+//
+//    if FieldByName('CycleYarnQty').Value = null then
+//    begin
+//      ZGS := 0; //循环根数
+//    end
+//    else
+//    begin
+//      ZGS := FieldByName('CycleYarnQty').Value; //循环根数
+//    end;
+//
+//    if FieldByName('Denier').Value = null then
+//    begin
+//      DS := 0;     //D数
+//    end
+//    else
+//    begin
+//      DS := FieldByName('Denier').Value;     //D数
+//    end;
+//
+//    TW := strtofloatdef(WB_YarnQty.text, 0); //头纹
+//  end;
+//  if ZGS <> 0 then
+//  begin
+//    with CDS_SUB do
+//    begin
+//      Edit;
+//      FieldByName('MeterQty').Value := roundfloat(GS / ZGS * TW * DS / 9000, 2);
+//      Post;
+//    end;
+//  end;
+end;
+
+procedure TfrmWBSpecInPut.WB_TYPEPropertiesChange(Sender: TObject);
+begin
+  if WB_TYPE.Text = '整浆并' then
+  begin
+    cxGroupBox2.Visible := True;
+    cxGroupBox1.Visible := false;
+  end
+  else
+  begin
+    cxGroupBox2.Visible := false;
+    cxGroupBox1.Visible := True;
+  end;
+
+end;
+
+procedure TfrmWBSpecInPut.WB_YarnQtyExit(Sender: TObject);
+begin
+  JS();
+end;
+
+procedure TfrmWBSpecInPut.WB_YarnQtyPropertiesEditValueChanged(Sender: TObject);
+begin
+  JSJS();
+end;
+
 end.
 

A02基础产品管理/U_WBSpecInPutOld.dfm

@@ -0,0 +1,607 @@
+inherited frmWBSpecInPutOld: TfrmWBSpecInPutOld
+  Left = 88
+  Top = 141
+  Caption = #25972#32463#24037#33402#24405#20837
+  ClientHeight = 755
+  ClientWidth = 1115
+  Color = clWhite
+  Font.Height = -16
+  Position = poMainFormCenter
+  ExplicitWidth = 1131
+  ExplicitHeight = 794
+  PixelsPerInch = 96
+  TextHeight = 21
+  object cxGrid1: TcxGrid [0]
+    Left = 0
+    Top = 461
+    Width = 1115
+    Height = 294
+    Align = alClient
+    TabOrder = 0
+    object Tv1: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DS_1
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skCount
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsCustomize.ColumnFiltering = False
+      OptionsView.GroupByBox = False
+      object v1Column18: TcxGridDBColumn
+        Caption = #37319#36141#21152#24037#21512#21516#21495
+        DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        VisibleForCustomization = False
+        Width = 106
+      end
+      object v1Column15: TcxGridDBColumn
+        Caption = #21697#29260
+        DataBinding.FieldName = 'SXPinPai'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        VisibleForCustomization = False
+        Width = 103
+      end
+      object Tv1Column3: TcxGridDBColumn
+        Caption = #34892#21495
+        DataBinding.FieldName = 'RowNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #32534#21495
+        DataBinding.FieldName = 'Y_Code'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Properties.OnButtonClick = Tv1Column2PropertiesButtonClick
+        HeaderAlignmentHorz = taCenter
+        Width = 94
+      end
+      object v1SPName: TcxGridDBColumn
+        Caption = #21697#21517
+        DataBinding.FieldName = 'Y_Name'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Properties.OnButtonClick = Tv1Column2PropertiesButtonClick
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 101
+      end
+      object v1SPSpec: TcxGridDBColumn
+        Caption = #35268#26684
+        DataBinding.FieldName = 'Y_Spec'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        HeaderGlyphAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 116
+      end
+      object v1Column1: TcxGridDBColumn
+        Caption = #25209#21495
+        DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        VisibleForCustomization = False
+        Width = 92
+      end
+      object v1Column10: TcxGridDBColumn
+        Caption = #36816#36153
+        DataBinding.FieldName = 'YunFei'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        VisibleForCustomization = False
+        Width = 68
+      end
+      object Tv1Column1: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'Y_Color'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object v1Column3: TcxGridDBColumn
+        Caption = #26681#25968
+        DataBinding.FieldName = 'YarnQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 72
+      end
+      object Tv1Column4: TcxGridDBColumn
+        Caption = #24490#29615#26681#25968
+        DataBinding.FieldName = 'CycleYarnQty'
+        DataBinding.IsNullValueType = True
+        GroupSummaryAlignment = taCenter
+        HeaderAlignmentHorz = taCenter
+        Width = 102
+      end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #32442#27861
+        DataBinding.FieldName = 'FF'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column5: TcxGridDBColumn
+        Caption = #25467#24230
+        DataBinding.FieldName = 'ND'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #29702#35770'D'#25968
+        DataBinding.FieldName = 'Denier'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object v1Column12: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 118
+      end
+    end
+    object cxGrid1Level1: TcxGridLevel
+      GridView = Tv1
+    end
+  end
+  object ToolBar1: TToolBar [1]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1115
+    Height = 30
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 99
+    Caption = 'ToolBar1'
+    DisabledImages = BaseDataLink.cxImageList_bar
+    Images = cxImageList_bar
+    List = True
+    ShowCaptions = True
+    TabOrder = 1
+    object TBSave: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384
+      ImageIndex = 16
+      OnClick = TBSaveClick
+    end
+    object btn1: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #22383#24067#20449#24687
+      ImageIndex = 8
+      OnClick = btn1Click
+    end
+    object ToolButton1: TToolButton
+      Left = 174
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = ToolButton1Click
+    end
+    object TBClose: TToolButton
+      Left = 277
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object ScrollBox1: TScrollBox [2]
+    Left = 0
+    Top = 30
+    Width = 1115
+    Height = 401
+    Align = alTop
+    BevelInner = bvNone
+    BevelOuter = bvNone
+    BorderStyle = bsNone
+    Ctl3D = False
+    ParentCtl3D = False
+    TabOrder = 2
+    object Label7: TLabel
+      Left = 75
+      Top = 342
+      Width = 32
+      Height = 21
+      Caption = #22791#27880
+    end
+    object Label3: TLabel
+      Left = 11
+      Top = 11
+      Width = 96
+      Height = 21
+      Caption = #25972#32463#24037#33402#32534#21495
+    end
+    object Label4: TLabel
+      Left = 59
+      Top = 248
+      Width = 48
+      Height = 21
+      Caption = #20301#31227#37327
+    end
+    object Label8: TLabel
+      Left = 59
+      Top = 50
+      Width = 48
+      Height = 21
+      Caption = #24635#22836#20221
+    end
+    object Label1: TLabel
+      Left = 329
+      Top = 11
+      Width = 96
+      Height = 21
+      Caption = #25972#32463#24037#33402#21517#31216
+    end
+    object Label2: TLabel
+      Left = 43
+      Top = 167
+      Width = 64
+      Height = 21
+      Caption = #31576#31359#20837#27861
+    end
+    object Label5: TLabel
+      Left = 361
+      Top = 50
+      Width = 64
+      Height = 21
+      Caption = #19978#25490#39063#25968
+    end
+    object Label6: TLabel
+      Left = 393
+      Top = 88
+      Width = 32
+      Height = 21
+      Caption = #38646#22836
+    end
+    object Label9: TLabel
+      Left = 75
+      Top = 88
+      Width = 32
+      Height = 21
+      Caption = #21514#25968
+    end
+    object Label10: TLabel
+      Left = 361
+      Top = 127
+      Width = 64
+      Height = 21
+      Caption = #29301#32463#31576#21495
+    end
+    object Label11: TLabel
+      Left = 43
+      Top = 127
+      Width = 64
+      Height = 21
+      Caption = #32463#36724#38376#24133
+    end
+    object Label12: TLabel
+      Left = 361
+      Top = 167
+      Width = 64
+      Height = 21
+      Caption = #32463#36724#31859#25968
+    end
+    object Label13: TLabel
+      Left = 694
+      Top = 11
+      Width = 64
+      Height = 21
+      Caption = #29301#32463#25490#21015
+    end
+    object Label14: TLabel
+      Left = 43
+      Top = 206
+      Width = 64
+      Height = 21
+      Caption = #22987#21514#20301#32622
+    end
+    object Label15: TLabel
+      Left = 361
+      Top = 206
+      Width = 64
+      Height = 21
+      Caption = #22369#26012#24230#25968
+    end
+    object Label16: TLabel
+      Left = 329
+      Top = 248
+      Width = 96
+      Height = 21
+      Caption = #29301#32463#24352#21147#21442#25968
+    end
+    object Label17: TLabel
+      Left = 75
+      Top = 287
+      Width = 32
+      Height = 21
+      Caption = #32463#23494
+    end
+    object WB_Code: TcxTextEdit
+      Tag = 2
+      Left = 113
+      Top = 5
+      Enabled = False
+      ParentColor = True
+      TabOrder = 0
+      Width = 200
+    end
+    object WB_YarnQty: TcxTextEdit
+      Tag = 2
+      Left = 113
+      Top = 44
+      ParentColor = True
+      TabOrder = 1
+      Width = 200
+    end
+    object WB_Move: TcxTextEdit
+      Tag = 2
+      Left = 113
+      Top = 242
+      ParentColor = True
+      TabOrder = 2
+      Width = 200
+    end
+    object WB_Name: TcxTextEdit
+      Tag = 2
+      Left = 431
+      Top = 5
+      ParentColor = True
+      TabOrder = 3
+      Width = 200
+    end
+    object WB_ReedNote: TcxTextEdit
+      Tag = 2
+      Left = 113
+      Top = 161
+      ParentColor = True
+      TabOrder = 4
+      Width = 200
+    end
+    object WB_YarnArr: TcxTextEdit
+      Tag = 2
+      Left = 431
+      Top = 44
+      ParentColor = True
+      TabOrder = 5
+      Width = 200
+    end
+    object WB_YarnStripRemainder: TcxTextEdit
+      Tag = 2
+      Left = 431
+      Top = 82
+      ParentColor = True
+      TabOrder = 6
+      Width = 200
+    end
+    object WB_YarnStripQty: TcxTextEdit
+      Tag = 2
+      Left = 113
+      Top = 82
+      ParentColor = True
+      TabOrder = 7
+      Width = 200
+    end
+    object WB_ReedNo: TcxTextEdit
+      Tag = 2
+      Left = 431
+      Top = 121
+      ParentColor = True
+      TabOrder = 8
+      Width = 200
+    end
+    object WB_Width: TcxTextEdit
+      Tag = 2
+      Left = 113
+      Top = 121
+      ParentColor = True
+      TabOrder = 9
+      Width = 200
+    end
+    object WB_YarnLen: TcxTextEdit
+      Tag = 2
+      Left = 431
+      Top = 161
+      ParentColor = True
+      TabOrder = 10
+      Width = 200
+    end
+    object WB_Arg_SDWZ: TcxTextEdit
+      Tag = 2
+      Left = 113
+      Top = 200
+      ParentColor = True
+      TabOrder = 11
+      Width = 200
+    end
+    object WB_Arg_PXDS: TcxTextEdit
+      Tag = 2
+      Left = 431
+      Top = 200
+      ParentColor = True
+      TabOrder = 12
+      Width = 200
+    end
+    object WB_Arg_QJZL: TcxTextEdit
+      Tag = 2
+      Left = 431
+      Top = 242
+      ParentColor = True
+      TabOrder = 13
+      Width = 200
+    end
+    object WB_YarnArrNote: TcxMemo
+      Tag = 2
+      Left = 764
+      Top = 11
+      ParentFont = False
+      TabOrder = 14
+      Height = 264
+      Width = 317
+    end
+    object Note: TcxMemo
+      Tag = 2
+      Left = 113
+      Top = 320
+      TabOrder = 15
+      Height = 65
+      Width = 550
+    end
+    object WB_YarnDensity: TcxTextEdit
+      Tag = 2
+      Left = 113
+      Top = 281
+      ParentColor = True
+      TabOrder = 16
+      Width = 200
+    end
+  end
+  object ToolBar2: TToolBar [3]
+    Tag = 1
+    Left = 0
+    Top = 431
+    Width = 1115
+    Height = 30
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 67
+    Caption = 'ToolBar1'
+    DisabledImages = BaseDataLink.cxImageList_bar
+    Images = BaseDataLink.cxImageList_bar
+    List = True
+    ShowCaptions = True
+    TabOrder = 3
+    Visible = False
+    object ToolButton3: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #26032#22686
+      ImageIndex = 2
+      OnClick = TBAddClick
+    end
+    object ToolButton4: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 6
+      OnClick = TBDelClick
+    end
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = ADOConnection1
+    Left = 465
+    Top = 592
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = ADOConnection1
+    Left = 665
+    Top = 601
+  end
+  inherited ImageList_new32: TImageList
+    Left = 170
+    Top = 587
+  end
+  inherited cxImageList_bar: TcxImageList
+    FormatVersion = 1
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_Sub
+    Left = 256
+    Top = 584
+  end
+  object CDS_Sub: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 304
+    Top = 584
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = ADOConnection1
+    Parameters = <>
+    Left = 736
+    Top = 594
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = ADOConnection1
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 386
+    Top = 589
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = ADOConnection1
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 580
+    Top = 593
+  end
+  object GPM_1: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 216
+    Top = 584
+  end
+  object ADOConnection1: TADOConnection
+    LoginPrompt = False
+    Left = 624
+    Top = 168
+  end
+end

A02基础产品管理/U_WBSpecInPutOld.pas

@@ -0,0 +1,529 @@
+unit U_WBSpecInPutOld;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, cxCalendar, cxDropDownEdit, ComCtrls, ToolWin,
+  cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
+  cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
+  cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
+  dxBarBuiltInMenu, U_BaseInput, U_BaseList, System.ImageList, Vcl.ImgList,
+  cxMemo, dxScrollbarAnnotations, cxContainer, cxImageList, dxSkinsCore,
+  dxSkinsDefaultPainters;
+
+type
+  TfrmWBSpecInPutOld = class(TfrmBaseInput)
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v1SPName: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    ToolBar1: TToolBar;
+    TBSave: TToolButton;
+    TBClose: TToolButton;
+    DS_1: TDataSource;
+    CDS_Sub: TClientDataSet;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    GPM_1: TcxGridPopupMenu;
+    v1Column12: TcxGridDBColumn;
+    v1SPSpec: TcxGridDBColumn;
+    v1Column1: TcxGridDBColumn;
+    v1Column18: TcxGridDBColumn;
+    v1Column10: TcxGridDBColumn;
+    v1Column15: TcxGridDBColumn;
+    v1Column3: TcxGridDBColumn;
+    ToolButton1: TToolButton;
+    Tv1Column1: TcxGridDBColumn;
+    ScrollBox1: TScrollBox;
+    Label7: TLabel;
+    Label3: TLabel;
+    WB_Code: TcxTextEdit;
+    ToolBar2: TToolBar;
+    ToolButton3: TToolButton;
+    ToolButton4: TToolButton;
+    Label4: TLabel;
+    Label8: TLabel;
+    WB_YarnQty: TcxTextEdit;
+    WB_Move: TcxTextEdit;
+    Tv1Column2: TcxGridDBColumn;
+    Label1: TLabel;
+    Label2: TLabel;
+    WB_Name: TcxTextEdit;
+    WB_ReedNote: TcxTextEdit;
+    Label5: TLabel;
+    WB_YarnArr: TcxTextEdit;
+    Label6: TLabel;
+    WB_YarnStripRemainder: TcxTextEdit;
+    Label9: TLabel;
+    WB_YarnStripQty: TcxTextEdit;
+    Label10: TLabel;
+    WB_ReedNo: TcxTextEdit;
+    Label11: TLabel;
+    WB_Width: TcxTextEdit;
+    Label12: TLabel;
+    WB_YarnLen: TcxTextEdit;
+    Label13: TLabel;
+    Label14: TLabel;
+    Label15: TLabel;
+    WB_Arg_SDWZ: TcxTextEdit;
+    WB_Arg_PXDS: TcxTextEdit;
+    Label16: TLabel;
+    WB_Arg_QJZL: TcxTextEdit;
+    Tv1Column3: TcxGridDBColumn;
+    WB_YarnArrNote: TcxMemo;
+    Note: TcxMemo;
+    btn1: TToolButton;
+    Tv1Column4: TcxGridDBColumn;
+    Label17: TLabel;
+    WB_YarnDensity: TcxTextEdit;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    ADOConnection1: TADOConnection;
+    Tv1Column7: TcxGridDBColumn;
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBAddClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBDelClick(Sender: TObject);
+    procedure TBSaveClick(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure btn1Click(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+  private
+    { Private declarations }
+    function SaveData(): Boolean;
+  public
+    { Public declarations }
+    FWBSID, FSTKName: string;
+  end;
+
+var
+  frmWBSpecInPutOld: TfrmWBSpecInPutOld;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp, U_YarnInfoSel, U_TatClothInfoSel;
+
+{$R *.dfm}
+
+procedure TfrmWBSpecInPutOld.btn1Click(Sender: TObject);
+begin
+  try
+    frmTatClothInfoSel := TfrmTatClothInfoSel.Create(Application);
+    with frmTatClothInfoSel do
+    begin
+      if ShowModal = 1 then
+      begin
+
+        Self.WB_YarnQty.Text := frmTatClothInfoSel.CDS_1.fieldbyname('C_YarnQty').AsString;
+        Self.WB_ReedNo.Text := frmTatClothInfoSel.CDS_1.fieldbyname('C_ReedNo').AsString;
+
+        with Self.ADOQueryTemp do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('select A.*  from BS_Cloth_Yarn A inner join Bs_Cloth_Info B on A.BCIID=B.BCIID');
+          sql.Add(' where A.YRType=''经丝'' and B.C_Code=''' + Trim(frmTatClothInfoSel.CDS_1.fieldbyname('C_Code').AsString) + '''');
+          Open;
+          First;
+          Self.CDS_Sub.EmptyDataSet;
+          while not Eof do
+          begin
+            with Self.CDS_Sub do
+            begin
+              Append;
+              FieldByName('RowNo').Value := Self.ADOQueryTemp.fieldbyname('RowNo').value;
+              FieldByName('Y_Code').Value := Self.ADOQueryTemp.fieldbyname('Y_Code').value;
+              FieldByName('Y_Name').Value := Self.ADOQueryTemp.fieldbyname('Y_Name').value;
+              FieldByName('Y_Spec').Value := Self.ADOQueryTemp.fieldbyname('Y_Spec').value;
+              FieldByName('Y_Color').Value := Self.ADOQueryTemp.fieldbyname('Y_Color').value;
+              FieldByName('YarnQty').Value := Self.ADOQueryTemp.fieldbyname('YarnQty').value;
+              FieldByName('CycleYarnQty').Value := Self.ADOQueryTemp.fieldbyname('CycleYarnQty').value;
+            end;
+            Next;
+          end;
+
+        end;
+
+      end;
+    end;
+  finally
+    frmTatClothInfoSel.Free;
+  end;
+end;
+
+procedure TfrmWBSpecInPutOld.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmWBSpecInPutOld.FormCreate(Sender: TObject);
+begin
+  inherited;
+  try
+    with ADOConnection1 do
+    begin
+      Connected := false;
+      ConnectionString := DConString;
+      Connected := true;
+    end;
+    ADOQueryBaseCmd.Connection := ADOConnection1;
+    ADOQueryBaseTemp.Connection := ADOConnection1;
+  except
+    application.MessageBox('网络连接失败！', '提示信息');
+  end;
+end;
+
+procedure TfrmWBSpecInPutOld.TBAddClick(Sender: TObject);
+begin
+  try
+    frmYarnInfoSel := TfrmYarnInfoSel.Create(Application);
+    with frmYarnInfoSel do
+    begin
+      FSTKName := '纱线';
+      if ShowModal = 1 then
+      begin
+        with Self.CDS_Sub do
+        begin
+          Append;
+          FieldByName('Y_Color').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Color').value;
+          FieldByName('Y_Code').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Code').value;
+          FieldByName('Y_Name').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Name').value;
+          FieldByName('Y_Spec').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Spec').value;
+          FieldByName('FF').Value := frmYarnInfoSel.CDS_1.fieldbyname('FF').value;
+          FieldByName('ND').Value := frmYarnInfoSel.CDS_1.fieldbyname('ND').value;
+          FieldByName('Denier').Value := frmYarnInfoSel.CDS_1.fieldbyname('Denier').value;
+          FieldByName('Y_Ratio').Value := 0;
+        end;
+      end;
+    end;
+  finally
+    frmYarnInfoSel.Free;
+  end;
+end;
+
+function TfrmWBSpecInPutOld.SaveData(): Boolean;
+var
+  MaxNo, MaxYRId: string;
+begin
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+
+    if Trim(FWBSID) = '' then
+    begin
+      if GetLSNo(ADOQueryCmd, MaxNo, 'QJ', 'Tat_WB_Spec', 5, 0) = False then
+        raise Exception.Create('取最大号失败！');
+
+      WB_Code.Text := MaxNo;
+    end
+    else
+    begin
+      MaxNo := Trim(FWBSID);
+    end;
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add('select * from Tat_WB_Spec where WBSID=''' + Trim(MaxNo) + '''');
+      Open;
+    end;
+    with ADOQueryCmd do
+    begin
+      if Trim(FWBSID) = '' then
+      begin
+        Append;
+        FieldByName('FillId').Value := Trim(DCode);
+        FieldByName('Filler').Value := Trim(DName);
+      end
+      else
+      begin
+        Edit;
+        FieldByName('EditId').Value := Trim(DCode);
+        FieldByName('Editer').Value := Trim(DName);
+        FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp);
+      end;
+      FieldByName('WBSID').Value := Trim(MaxNo);
+      RTSetsavedata(ADOQueryCmd, 'Tat_WB_Spec', ScrollBox1, 2);
+      Post;
+    end;
+
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from Tat_WB_Spec where WB_Code=' + quotedstr(trim(WB_Code.Text)));
+      Open;
+    end;
+    if ADOQueryCmd.RecordCount > 1 then
+      raise Exception.Create('编号重复!');
+
+    CDS_Sub.DisableControls;
+    with CDS_Sub do
+    begin
+      First;
+      while not eof do
+      begin
+        with ADOQueryTemp do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('select * from Tat_WB_Formula  ');
+          sql.Add('where WBSID=''' + Trim(MaxNo) + '''');
+          sql.Add('and YRId=''' + Trim(CDS_Sub.fieldbyname('YRId').AsString) + '''');
+          open;
+        end;
+        MaxYRId := Trim(ADOQueryTemp.fieldbyname('YRId').AsString);
+        if Trim(MaxYRId) = '' then
+        begin
+          if GetLSNo(ADOQueryCmd, MaxYRId, 'P', 'Tat_WB_Formula', 4, 0) = False then
+            raise Exception.Create('取最大号失败！');
+        end
+        else
+        begin
+          MaxYRId := Trim(MaxYRId);
+        end;
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('select * from Tat_WB_Formula where YRId=''' + Trim(MaxYRId) + '''');
+          Open;
+        end;
+        with ADOQueryCmd do
+        begin
+          if Trim(MaxYRId) = '' then
+          begin
+            Append;
+            FieldByName('Fillid').Value := Trim(Dcode);
+            FieldByName('Filler').Value := Trim(DName)
+          end
+          else
+          begin
+            Edit;
+            FieldByName('Editid').Value := Trim(Dcode);
+            FieldByName('Editer').Value := Trim(DName);
+            FieldByName('EditTime').Value := SGetServerDate(ADOQueryTemp);
+          end;
+          FieldByName('WBSID').Value := Trim(MaxNo);
+          FieldByName('YRId').Value := Trim(MaxYRId);
+          RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_Sub, 'Tat_WB_Formula', 0);
+          Post;
+        end;
+
+        Edit;
+        FieldByName('YRId').Value := Trim(MaxYRId);
+        Post;
+        Next;
+      end;
+    end;
+    CDS_Sub.EnableControls;
+
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('update  Tat_WB_Spec set WB_Name=');   // X.RowNo
+      sql.Add(' SUBSTRING(CAST((select ''+''+X.Y_Name from Tat_WB_Formula X where  isnull(X.Y_Name,'''')<>'''' and X.WBSID=Tat_WB_Spec.WBSID order by RowNo for xml path('''') ) AS VARCHAR(200)) , 2, 200)');
+      sql.Add('where isnull(WB_Name,'''')='''' and WBSID=''' + Trim(MaxNo) + '''');
+//      ShowMessage(SQL.Text);
+      ExecSQL;
+    end;
+    ADOQueryCmd.Connection.CommitTrans;
+    Result := True;
+  except
+    Result := False;
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+  end;
+
+end;
+
+procedure TfrmWBSpecInPutOld.TBCloseClick(Sender: TObject);
+begin
+
+  Close;
+end;
+
+procedure TfrmWBSpecInPutOld.FormShow(Sender: TObject);
+var
+  fsj: string;
+begin
+  inherited;
+  ReadCxGrid(trim(self.Caption), Tv1, '经规格仓库');
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add(' select * from Tat_WB_Spec ');
+    sql.Add(' where WBSID=''' + Trim(FWBSID) + '''');
+    Open;
+  end;
+  SCSHData(ADOQueryTemp, ScrollBox1, 2);
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add(' select * from Tat_WB_Formula ');
+    sql.Add(' where WBSID=''' + Trim(FWBSID) + '''');
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_Sub);
+  SInitCDSData(ADOQueryTemp, CDS_Sub);
+
+  if FWBSID = '' then
+  begin
+    with CDS_Sub do
+    begin
+      Append;
+      FieldByName('RowNo').Value := 'A';
+      Post;
+      Append;
+      FieldByName('RowNo').Value := 'B';
+      Post;
+      Append;
+      FieldByName('RowNo').Value := 'C';
+      Post;
+      Append;
+      FieldByName('RowNo').Value := 'D';
+      Post;
+      Append;
+      FieldByName('RowNo').Value := 'E';
+      Post;
+      Append;
+      FieldByName('RowNo').Value := 'F';
+      Post;
+      Append;
+      FieldByName('RowNo').Value := 'G';
+      Post;
+    end;
+  end;
+
+end;
+
+procedure TfrmWBSpecInPutOld.TBDelClick(Sender: TObject);
+begin
+  if CDS_Sub.IsEmpty then
+    Exit;
+  if Trim(CDS_Sub.fieldbyname('YRId').AsString) <> '' then
+  begin
+    if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+      Exit;
+
+    try
+      ADOQueryCmd.Connection.BeginTrans;
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add(' delete Tat_WB_Formula where YRId=''' + Trim(CDS_Sub.fieldbyname('YRId').AsString) + '''');
+        ExecSQL;
+      end;
+
+      ADOQueryCmd.Connection.CommitTrans;
+      CDS_Sub.Delete;
+    except
+      ADOQueryCmd.Connection.RollbackTrans;
+      Application.MessageBox('删除异常!', '提示', 0);
+    end;
+
+  end
+  else
+  begin
+    CDS_Sub.Delete;
+  end;
+
+end;
+
+procedure TfrmWBSpecInPutOld.TBSaveClick(Sender: TObject);
+begin
+  ToolBar1.SetFocus;
+  if StrToFloatDef(WB_YarnDensity.Text, 0) = 0 then
+  begin
+    Application.MessageBox('请填写正确的经密!', '提示', 0);
+    Exit;
+  end;
+  if StrToFloatDef(WB_Width.Text, 0) = 0 then
+  begin
+    Application.MessageBox('请填写正确的经轴门幅!', '提示', 0);
+    Exit;
+  end;
+
+  with CDS_Sub do
+  begin
+    CDS_Sub.First;
+    while not Eof do
+    begin
+      if trim(CDS_Sub.fieldbyname('Y_Code').asstring) <> '' then
+      begin
+        if StrToFloatDef(Trim(CDS_Sub.fieldbyname('YarnQty').AsString), 0) = 0 then
+        begin
+          Application.MessageBox('根数不能为空!', '提示', 0);
+          Exit;
+        end;
+      end;
+
+      if trim(CDS_Sub.fieldbyname('Y_Code').asstring) <> '' then
+      begin
+        if StrToFloatDef(Trim(CDS_Sub.fieldbyname('CycleYarnQty').AsString), 0) = 0 then
+        begin
+          Application.MessageBox('循环根数不能为空!', '提示', 0);
+          Exit;
+        end;
+      end;
+
+      CDS_Sub.Next;
+    end;
+  end;
+
+  if SaveData() then
+  begin
+    Application.MessageBox('保存成功!', '提示', 0);
+    ModalResult := 1;
+    Exit;
+  end;
+end;
+
+procedure TfrmWBSpecInPutOld.ToolButton1Click(Sender: TObject);
+begin
+  WriteCxGrid(trim(self.Caption), Tv1, '经规格仓库');
+end;
+
+procedure TfrmWBSpecInPutOld.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmYarnInfoSel := TfrmYarnInfoSel.Create(Application);
+    with frmYarnInfoSel do
+    begin
+      FSTKName := '纱线';
+      if ShowModal = 1 then
+      begin
+        with Self.CDS_Sub do
+        begin
+          Edit;
+          FieldByName('Y_Color').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Color').value;
+          FieldByName('Y_Code').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Code').value;
+          FieldByName('Y_Name').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Name').value;
+          FieldByName('Y_Spec').Value := frmYarnInfoSel.CDS_1.fieldbyname('Y_Spec').value;
+          FieldByName('FF').Value := frmYarnInfoSel.CDS_1.fieldbyname('FF').value;
+          FieldByName('ND').Value := frmYarnInfoSel.CDS_1.fieldbyname('ND').value;
+          FieldByName('Denier').Value := frmYarnInfoSel.CDS_1.fieldbyname('Denier').value;
+          FieldByName('Y_Ratio').Value := 0;
+        end;
+      end;
+    end;
+  finally
+    frmYarnInfoSel.Free;
+  end;
+end;
+
+end.
+

B01基础合同管理/Contract.dproj.local

@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <Transaction>1899/12/30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.659,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.441,=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.569,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.398,=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_SalesContractList.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.423,=D:\Dp10RepoV1\项目代码\RTBasicsV1\B01基础合同管理\U_SalesContractList.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.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.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.564,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.569,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.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.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.375,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_ReceivableEdit_XT.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.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.419,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_BankSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.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.726,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.707,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.847,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.359,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\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.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.444,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.419,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_BankSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.359,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.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.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.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.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.247,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B01基础合同管理\U_finishSalesConInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.676,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.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.690,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.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.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj</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.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm</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.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.428,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.676,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.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.726,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.556,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.237,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList_XT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B01基础合同管理\U_SalesContractList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.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.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.284,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_SalesContractCPSel.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.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.525,D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用窗体\U_PictureUpload.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.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.538,D:\Dp10RepoV1\项目代码\D10szJinCheng\E01梭织生产计划\U_PictureUpload22.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\B01基础合同管理\U_PictureUpload11.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.247,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B01基础合同管理\U_finishSalesConInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.950,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.556,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.472,=D:\Dp10RepoV1\项目代码\花蝴蝶\B01基础合同管理\U_SalesConInPut.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.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10SZKaiXiYa"/>

B01基础合同管理/U_PurchaseContractList.pas

@@ -13,22 +13,7 @@ uses
   cxTextEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
   dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
   U_BaseList, RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, Vcl.Clipbrd,
-      
+  dxSkinOffice2013White, dxSkinSharpPlus, dxSkinWXI, dxScrollbarAnnotations,
-    
-     
-     
-     
-    
-    
-    
-   dxSkinOffice2013White, 
-    
-     
-    dxSkinSharpPlus, 
-     
-    
-    
-   dxSkinWXI,  dxScrollbarAnnotations,
   cxContainer, cxProgressBar;
 
 type

B01基础合同管理/U_SalesConInPut.dfm

@@ -952,6 +952,7 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.AssignedValues.DisplayFormat = True
         Properties.DecimalPlaces = 0
+        Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
@@ -991,36 +992,17 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         HeaderAlignmentHorz = taCenter
         Width = 105
       end
-      object v1Column2: TcxGridDBColumn
-        Caption = #22791#27880
-        DataBinding.FieldName = 'ConSNote'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 70
-      end
-      object Tv1Column4: TcxGridDBColumn
-        Caption = #20132#26399
-        DataBinding.FieldName = 'JHDate'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxDateEditProperties'
-        Properties.ReadOnly = False
-        HeaderAlignmentHorz = taCenter
-        Width = 120
-      end
-      object Tv1Column6: TcxGridDBColumn
-        Caption = #28322#30701#35013
-        DataBinding.FieldName = 'YDZ'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 120
-      end
       object Tv1Column13: TcxGridDBColumn
-        Caption = #31246#29575
+        Caption = #31246#29575'%'
         DataBinding.FieldName = 'TaxRate'
         DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxCurrencyEditProperties'
+        PropertiesClassName = 'TcxButtonEditProperties'
-        Properties.DecimalPlaces = 2
+        Properties.Buttons = <
-        Properties.DisplayFormat = '0.00'
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.OnButtonClick = Tv1Column13PropertiesButtonClick
         Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         Width = 80
@@ -1045,6 +1027,29 @@ inherited frmSalesConInPut: TfrmSalesConInPut
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
+      object Tv1Column4: TcxGridDBColumn
+        Caption = #20132#26399
+        DataBinding.FieldName = 'JHDate'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxDateEditProperties'
+        Properties.ReadOnly = False
+        HeaderAlignmentHorz = taCenter
+        Width = 120
+      end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #28322#30701#35013
+        DataBinding.FieldName = 'YDZ'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 120
+      end
+      object v1Column2: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'ConSNote'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
       object Tv1Column2: TcxGridDBColumn
         Caption = #22270#29255
         DataBinding.FieldName = 'AttName'

B01基础合同管理/U_SalesConInPut.pas

@@ -174,6 +174,7 @@ type
     procedure BankNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure ToolButton5Click(Sender: TObject);
     procedure CurrencyPropertiesChange(Sender: TObject);
+    procedure Tv1Column13PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
   private
     FLeft, FTop: Integer;
     fuserName, Fstatus: string;
@@ -793,7 +794,7 @@ end;
 procedure TfrmSalesConInPut.v1PRTOrderQtyPropertiesEditValueChanged(Sender: TObject);
 var
   mvalue, FFieldName: string;
-  FConQty, FConPrice, FC_Money: Double;        //个数，单价，金额
+  FConQty, FConPrice, FC_Money: Double;        //ÊýÁ¿£¬µ¥¼Û£¬½ð¶î
   mTaxRate, mTax, mTaxInclude: Double;        //税率，税额，含税金额
 
   mCP_QTY, mCP_TPXS: Double;                 //成品数量，投坯系数
@@ -815,7 +816,7 @@ begin
     FConQty := Fieldbyname('ConQty').AsFloat;
     FConPrice := Fieldbyname('ConPrice').AsFloat;
 
-    mTaxRate := Fieldbyname('TaxRate').AsFloat;
+    mTaxRate := Fieldbyname('TaxRate').AsFloat / 100;
     mTax := Fieldbyname('Tax').AsFloat;
     mTaxInclude := Fieldbyname('TaxInclude').AsFloat;
 
@@ -823,7 +824,11 @@ begin
     mCP_TPXS := Fieldbyname('CP_TPXS').AsFloat;
   end;
 
-  FConQty := RoundFloat((mCP_TPXS + 1) * mCP_QTY, 0);
+  if mCP_QTY <> 0 then
+  begin
+    FConQty := RoundFloat((mCP_TPXS + 1) * mCP_QTY, 0);
+  end;
+
   FC_Money := RoundFloat(FConQty * FConPrice, 2);
   mTax := RoundFloat(FC_Money * mTaxRate, 2);
   mTaxInclude := RoundFloat(FC_Money + mTax, 2);
@@ -835,7 +840,7 @@ begin
 //    FieldByName('ConPrice').Value := FConPrice;
     FieldByName('ConTotalAmount').Value := FC_Money;
 
-    FieldByName('TaxRate').Value := mTaxRate;
+    FieldByName('TaxRate').Value := mTaxRate * 100;
     FieldByName('Tax').Value := mTax;
     FieldByName('TaxInclude').Value := mTaxInclude;
     Post;
@@ -1158,6 +1163,28 @@ begin
   SetXH();
 end;
 
+procedure TfrmSalesConInPut.Tv1Column13PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      flag := 'TaxRate';
+      flagname := 'Ë°ÂÊ';
+      if ShowModal = 1 then
+      begin
+        Self.Order_Sub.Edit;
+        Self.Order_Sub.FieldByName('TaxRate').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+//        Self.Order_Sub.Post;
+      end;
+    end;
+    Tv1Column13.Properties.OnEditValueChanged(Sender);
+  finally
+    frmZDYHelp.Free;
+
+  end;
+end;
+
 procedure TfrmSalesConInPut.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try

B01基础合同管理/U_SalesContractList.dfm

@@ -567,7 +567,7 @@ inherited frmSalesContractList: TfrmSalesContractList
     TabOrder = 2
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 11
-    Properties.TabIndex = 3
+    Properties.TabIndex = 0
     Properties.Tabs.Strings = (
       #26410#25552#20132
       #24050#25552#20132
@@ -577,6 +577,7 @@ inherited frmSalesContractList: TfrmSalesContractList
       #20840#37096)
     LookAndFeel.Kind = lfUltraFlat
     OnChange = cxTabControl1Change
+    ExplicitTop = 127
     ClientRectBottom = 34
     ClientRectLeft = 2
     ClientRectRight = 1538

B04采购计划管理/PurchasePlan.dproj.local

@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\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.630,=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.734,=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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.931,=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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.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.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.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.921,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B04采购计划管理\U_GKManageSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.921,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B04采购计划管理\U_GKManageSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.135,=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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.263,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanList_ZZD.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.263,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanList_ZZD.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10SZKaiXiYa"/>

B04采购计划管理/U_YarnPurchasePlanList.dfm

@@ -597,7 +597,7 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList
       end
       object Tv21Column16: TcxGridDBColumn
         Caption = #21697#21517
-        DataBinding.FieldName = 'Y_Code'
+        DataBinding.FieldName = 'Y_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False

B04采购计划管理/U_YarnPurchasePlanPut.dfm

@@ -10,6 +10,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
   OldCreateOrder = True
   Position = poScreenCenter
   WindowState = wsMaximized
+  ExplicitLeft = -673
   ExplicitWidth = 1540
   ExplicitHeight = 757
   PixelsPerInch = 96
@@ -123,7 +124,6 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
     Align = alClient
     BorderStyle = cxcbsNone
     TabOrder = 2
-    ExplicitHeight = 465
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -144,7 +144,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
         item
           Format = '0'
           Position = spFooter
-          Column = v1PRTPrice
+          Column = Tv1Price
         end>
       DataController.Summary.FooterSummaryItems = <
         item
@@ -156,7 +156,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
         end
         item
           Kind = skSum
-          Column = Tv1Column9
+          Column = Tv1Amount
         end
         item
           Kind = skSum
@@ -337,24 +337,59 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
-      object v1PRTPrice: TcxGridDBColumn
+      object Tv1Price: TcxGridDBColumn
-        Caption = #21333#20215
+        Caption = #19981#21547#31246#21333#20215
         DataBinding.FieldName = 'Price'
         DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '0.00'
         Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         Options.Sorting = False
-        Width = 90
+        Width = 104
       end
-      object Tv1Column9: TcxGridDBColumn
+      object Tv1Amount: TcxGridDBColumn
-        Caption = #37329#39069
+        Caption = #19981#21547#31246#37329#39069
         DataBinding.FieldName = 'Amount'
         DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '0.00'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 90
+        Width = 107
+      end
+      object Tv1TaxRate: TcxGridDBColumn
+        Caption = #31246#29575'%'
+        DataBinding.FieldName = 'TaxRate'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.OnButtonClick = Tv1TaxRatePropertiesButtonClick
+        Properties.OnEditValueChanged = v1PRTOrderQtyPropertiesEditValueChanged
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Tax: TcxGridDBColumn
+        Caption = #31246#39069
+        DataBinding.FieldName = 'Tax'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '0.00'
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1TaxInclude: TcxGridDBColumn
+        Caption = #21547#31246#37329#39069
+        DataBinding.FieldName = 'TaxInclude'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '0.00'
+        HeaderAlignmentHorz = taCenter
+        Width = 80
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #24065#31181
@@ -365,7 +400,9 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
           'USD'
           'RMB'
           'VND')
+        Properties.OnChange = Tv1Column4PropertiesChange
         HeaderAlignmentHorz = taCenter
+        Width = 78
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
@@ -630,8 +667,6 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
     PopupMenu = pm_sub
     TabOrder = 4
     Visible = False
-    ExplicitLeft = 1485
-    ExplicitTop = 192
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

B04采购计划管理/U_YarnPurchasePlanPut.pas

@@ -16,7 +16,7 @@ uses
   IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
   IdExplicitTLSClientServerBase, IdFTP, ShellAPI, dxScrollbarAnnotations, dxCore,
   cxDateUtils, cxImageList, dxSkinsCore, dxSkinsDefaultPainters,
-  dxSkinOffice2013White, dxSkinSharpPlus, dxSkinWXI;
+  dxSkinOffice2013White, dxSkinSharpPlus, dxSkinWXI, cxCurrencyEdit;
 
 type
   TfrmYarnPurchasePlanPut = class(TfrmBaseInput)
@@ -43,8 +43,8 @@ type
     v1Column5: TcxGridDBColumn;
     v1PRTOrderQty: TcxGridDBColumn;
     v1OrderUnit: TcxGridDBColumn;
-    v1PRTPrice: TcxGridDBColumn;
+    Tv1Price: TcxGridDBColumn;
-    Tv1Column9: TcxGridDBColumn;
+    Tv1Amount: TcxGridDBColumn;
     v1Column2: TcxGridDBColumn;
     cxGrid1Level1: TcxGridLevel;
     Tv1Column2: TcxGridDBColumn;
@@ -97,6 +97,9 @@ type
     Tv1Column10: TcxGridDBColumn;
     Tv1Column12: TcxGridDBColumn;
     ToolButton6: TToolButton;
+    Tv1TaxRate: TcxGridDBColumn;
+    Tv1TaxInclude: TcxGridDBColumn;
+    Tv1Tax: TcxGridDBColumn;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -128,6 +131,9 @@ type
     procedure ToolButton5Click(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
     procedure v1OrderUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure Tv1TaxRatePropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure Tv1Column4PropertiesChange(Sender: TObject);
   private
     FLeft, FTop: Integer;
     fuserName, Fstatus: string;
@@ -765,9 +771,12 @@ end;
 procedure TfrmYarnPurchasePlanPut.v1PRTOrderQtyPropertiesEditValueChanged(Sender: TObject);
 var
   mvalue, FFieldName: string;
-  FPieceKG, FPiece, FQty, FPrice, FAmount, FPrice2, FAmount2, FSL, FKeKG, FSJPrice, FSJMoney: Double;        //个数，单价，
+  FQty, FPrice, FC_Money: Double;        //数量，单价，金额
-  FKeShu: Integer;
+  mTaxRate, mTax, mTaxInclude: Double;        //税率，税额，含税金额
+
+//  mCP_QTY, mCP_TPXS: Double;                 //成品数量，投坯系数
 begin
+
   mvalue := TcxTextEdit(Sender).EditingText;
   if Trim(mvalue) = '' then
   begin
@@ -778,20 +787,39 @@ begin
   with Order_Sub do
   begin
     Edit;
-    FieldByName(FFieldName).Value := Trim(mvalue);
+    FieldByName(FFieldName).Value := StrToFloat(Trim(mvalue));
     Post;
-
+//    ShowMessage(Fieldbyname('TaxRate').AsString);
     FQty := Fieldbyname('Qty').AsFloat;
-    FPrice := Fieldbyname('Price').AsFloat;      //单价
+    FPrice := Fieldbyname('Price').AsFloat;
+
+    mTaxRate := Fieldbyname('TaxRate').AsFloat / 100;
+    mTax := Fieldbyname('Tax').AsFloat;
+    mTaxInclude := Fieldbyname('TaxInclude').AsFloat;
+
+//    mCP_QTY := Fieldbyname('CP_QTY').AsFloat;
+//    mCP_TPXS := Fieldbyname('CP_TPXS').AsFloat;
   end;
 
-  FAmount := RoundFloat(FQty * FPrice, 2);   //金额
+//  if mCP_QTY <> 0 then
+//  begin
+//    FQty := RoundFloat((mCP_TPXS + 1) * mCP_QTY, 0);
+//  end;
+
+  FC_Money := RoundFloat(FQty * FPrice, 2);
+  mTax := RoundFloat(FC_Money * mTaxRate, 2);
+  mTaxInclude := RoundFloat(FC_Money + mTax, 2);
 
   with Order_Sub do
   begin
     Edit;
+    FieldByName('Qty').Value := FQty;
+//    FieldByName('ConPrice').Value := FConPrice;
+    FieldByName('Amount').Value := FC_Money;
 
-    FieldByName('Amount').Value := FAmount;
+    FieldByName('TaxRate').Value := mTaxRate * 100;
+    FieldByName('Tax').Value := mTax;
+    FieldByName('TaxInclude').Value := mTaxInclude;
     Post;
   end;
   tv1.Controller.EditingController.ShowEdit();
@@ -1118,6 +1146,51 @@ begin
   end;
 end;
 
+procedure TfrmYarnPurchasePlanPut.Tv1Column4PropertiesChange(Sender: TObject);
+begin
+  inherited;
+//  if Order_Sub.FieldByName('currency').value = 'VND' then
+ if TcxTextEdit(Sender).EditingText = 'VND' then
+  begin
+
+    (Tv1Price.Properties as TcxCurrencyEditProperties).DisplayFormat := '';
+    (Tv1Amount.Properties as TcxCurrencyEditProperties).DisplayFormat := '';
+    (Tv1Tax.Properties as TcxCurrencyEditProperties).DisplayFormat := '';
+    (Tv1TaxInclude.Properties as TcxCurrencyEditProperties).DisplayFormat := '';
+
+    (Tv1Price.Properties as TcxCurrencyEditProperties).DecimalPlaces := 0;
+    (Tv1Amount.Properties as TcxCurrencyEditProperties).DecimalPlaces := 0;
+    (Tv1Tax.Properties as TcxCurrencyEditProperties).DecimalPlaces := 0;
+    (Tv1TaxInclude.Properties as TcxCurrencyEditProperties).DecimalPlaces := 0;
+
+    with Order_Sub do
+    begin
+      Edit;
+      Fieldbyname('currency').value := TcxTextEdit(Sender).EditingText;
+      Fieldbyname('Price').Value := RoundFloat(Fieldbyname('Price').AsFloat, 0);
+      Fieldbyname('Amount').value := RoundFloat(Fieldbyname('Qty').AsFloat * Fieldbyname('Price').Asfloat, 0);
+      Fieldbyname('Tax').Value := RoundFloat(Fieldbyname('Tax').AsFloat, 0);
+      Fieldbyname('TaxInclude').value := RoundFloat(Fieldbyname('Qty').AsFloat * Fieldbyname('Price').Asfloat, 0);
+
+      Post;
+    end;
+
+  end
+  else
+  begin
+    (Tv1Price.Properties as TcxCurrencyEditProperties).DisplayFormat := '0.00';
+    (Tv1Amount.Properties as TcxCurrencyEditProperties).DisplayFormat := '0.00';
+    (Tv1Tax.Properties as TcxCurrencyEditProperties).DisplayFormat := '0.00';
+    (Tv1TaxInclude.Properties as TcxCurrencyEditProperties).DisplayFormat := '0.00';
+
+
+    (Tv1Price.Properties as TcxCurrencyEditProperties).DecimalPlaces := 2;
+    (Tv1Amount.Properties as TcxCurrencyEditProperties).DecimalPlaces := 2;
+    (Tv1Tax.Properties as TcxCurrencyEditProperties).DecimalPlaces := 2;
+    (Tv1TaxInclude.Properties as TcxCurrencyEditProperties).DecimalPlaces := 2;
+  end;
+end;
+
 procedure TfrmYarnPurchasePlanPut.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
 begin
 //  with ADO_2 do
@@ -1157,6 +1230,29 @@ begin
   Label4.Caption := '¿â´æ¼þÊý:' + Trim(ADOQuery1.fieldbyname('piece').AsString);
 end;
 
+procedure TfrmYarnPurchasePlanPut.Tv1TaxRatePropertiesButtonClick(
+  Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      flag := 'TaxRate';
+      flagname := '税率';
+      if ShowModal = 1 then
+      begin
+        Self.Order_Sub.Edit;
+        Self.Order_Sub.FieldByName('TaxRate').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+//        Self.Order_Sub.Post;
+      end;
+    end;
+    Tv1TaxRate.Properties.OnEditValueChanged(Sender);
+  finally
+    frmZDYHelp.Free;
+
+  end;
+end;
+
 procedure TfrmYarnPurchasePlanPut.v1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try

E00梭织通用窗体/U_TatPlanSel.dfm

@@ -3,14 +3,14 @@ inherited frmTatPlanSel: TfrmTatPlanSel
   Top = 106
   Caption = #32455#36896#21333#36873#25321
   ClientHeight = 643
-  ClientWidth = 1637
+  ClientWidth = 1540
   Color = clWhite
   Font.Charset = GB2312_CHARSET
   Font.Height = -12
   Font.Name = #23435#20307
   Position = poScreenCenter
   OnClose = FormClose
-  ExplicitWidth = 1653
+  ExplicitWidth = 1556
   ExplicitHeight = 682
   PixelsPerInch = 96
   TextHeight = 12
@@ -18,7 +18,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1637
+    Width = 1540
     Height = 38
     AutoSize = True
     ButtonHeight = 38
@@ -58,7 +58,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
   object Panel1: TPanel [1]
     Left = 0
     Top = 38
-    Width = 1637
+    Width = 1540
     Height = 59
     Align = alTop
     BevelInner = bvRaised
@@ -288,7 +288,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
   object cxTabControl1: TcxTabControl [2]
     Left = 0
     Top = 97
-    Width = 1637
+    Width = 1540
     Height = 546
     Align = alClient
     TabOrder = 2
@@ -300,15 +300,15 @@ inherited frmTatPlanSel: TfrmTatPlanSel
       #24050#32467#26463
       #20840#37096)
     OnChange = cxTabControl1Change
-    ClientRectBottom = 544
+    ClientRectBottom = 545
-    ClientRectLeft = 2
+    ClientRectLeft = 1
-    ClientRectRight = 1635
+    ClientRectRight = 1539
-    ClientRectTop = 28
+    ClientRectTop = 21
     object cxGrid1: TcxGrid
-      Left = 2
+      Left = 1
-      Top = 28
+      Top = 21
-      Width = 1633
+      Width = 1538
-      Height = 516
+      Height = 524
       Align = alClient
       TabOrder = 0
       object Tv1: TcxGridDBTableView

E00梭织通用窗体/U_TatPlanSel.pas

@@ -121,7 +121,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun;
+  U_DataLink, U_RTFun,U_TatPlanMachInput;
 
 {$R *.dfm}
 
@@ -191,7 +191,9 @@ begin
             sql.Add('and isnull(Status,''0'') not in (''11'',''22'') ');
           end;
       end;
-      sql.add('order by A.FILLTIME DESC');
+      sql.Add('and LoomType = ' + QuotedStr(Trim(frmTatPlanMachInput.FMCType)));
+      sql.add(' order by A.FILLTIME DESC');
+//      ShowMessage(SQL.Text);
       Open;
     end;
     SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));

E01梭织生产计划/TatPlan.dproj.local

@@ -1,77 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.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.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.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.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.469,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachInput.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.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.469,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachInput.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.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.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.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.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.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.628,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.258,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.258,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.628,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.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.248,=D:\Dp10RepoV1\项目代码\花蝴蝶\T00贸易通用窗体\U_TradeSalesContractSel.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.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.248,=D:\Dp10RepoV1\项目代码\花蝴蝶\T00贸易通用窗体\U_TradeSalesContractSel.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.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.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.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.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.467,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.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.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm</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.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.719,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.203,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.203,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.354,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.306,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.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.547,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachList.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.547,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.306,=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.719,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.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.125,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.297,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.297,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.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.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.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.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.467,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.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.125,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.561,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.561,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.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.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.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.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.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.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.259,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.259,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10SZKaiXiYa"/>

E01梭织生产计划/U_TatPlanMachInput.pas

@@ -85,7 +85,7 @@ type
     function CheckData(): Boolean;
     { Private declarations }
   public
-    FPMID, FCYCode, FCPID, FCPNO, FCPName, FMCNo: string;
+    FPMID, FCYCode, FCPID, FCPNO, FCPName, FMCNo, FMCType: string;
     CopyInt, PState: Integer;
 
     { Public declarations }
@@ -405,6 +405,7 @@ begin
     frmTatPlanSel := TfrmTatPlanSel.Create(Application);
     with frmTatPlanSel do
     begin
+
       if ShowModal = 1 then
       begin
         Self.OrderNo.Text := frmTatPlanSel.CDS_1.fieldbyname('OrderNo').AsString;

E01梭织生产计划/U_TatPlanMachList.dfm

@@ -207,7 +207,6 @@ inherited frmTatPlanMachList: TfrmTatPlanMachList
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 2
-    ExplicitLeft = -5
     ExplicitTop = 146
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>

E01梭织生产计划/U_TatPlanMachList.pas

@@ -396,6 +396,7 @@ begin
     with frmTatPlanMachInput do
     begin
       FMCNo := Trim(Self.CDS_1.fieldbyname('MCNo').AsString);
+      FMCType := Trim(Self.CDS_1.fieldbyname('MCType').AsString);
 //      FPMID := Trim(Self.CDS_1.fieldbyname('PMID').AsString);
       if ShowModal = 1 then
       begin

E02梭织经轴仓库/U_TatWBCardInPut.dfm

@@ -1224,7 +1224,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
         Width = 120
       end
       object F_YarnStripQty: TcxTextEdit
-        Tag = 2
+        Tag = 1
         Left = 106
         Top = 257
         ParentColor = True
@@ -1232,7 +1232,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
         Width = 120
       end
       object F_SJKESHU: TcxTextEdit
-        Tag = 2
+        Tag = 1
         Left = 338
         Top = 216
         ParentColor = True
@@ -1241,7 +1241,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
         Width = 120
       end
       object F_YUSHU: TcxTextEdit
-        Tag = 2
+        Tag = 1
         Left = 338
         Top = 257
         ParentColor = True
@@ -1268,6 +1268,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
         Width = 120
       end
       object BegDate: TcxDateEdit
+        Tag = 1
         Left = 338
         Top = 10
         AutoSize = False
@@ -1283,7 +1284,6 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
         Top = 455
         ParentColor = True
         TabOrder = 22
-        Text = 'ordqty'
         Width = 120
       end
     end

E02梭织经轴仓库/U_TatWBCardInPut.pas

@@ -209,7 +209,7 @@ implementation
 uses
   U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint, U_WBTatPlanSel, U_WBSpecSel,
   U_WarpBeamInfoSel, U_WBTypeSel, U_CompanySel, U_TatGYSel, U_GKManageSel,
-  U_TatPlanSel2;
+  U_TatPlanSel2, U_WeaveSel;
 
 {$R *.dfm} procedure TfrmTatWBCardInPut.InitCard3();
 begin
@@ -256,8 +256,8 @@ begin
     end;
     if Trim(WB_ProcessType.Text) = '本厂整经' then
     begin
-      if Trim(WB_Macher.Text) = '' then
+//      if Trim(WB_Macher.Text) = '' then
-        raise Exception.Create('扦经工位不能为空！');
+//        raise Exception.Create('扦经工位不能为空！');
     end;
     if trim(WB_Code.Text) = '' then
       raise Exception.Create('经编号不能为空！');
@@ -278,8 +278,8 @@ begin
 //      raise Exception.Create('整经长度不能为空！');
     if Trim(WB_ProcessType.Text) = '本厂整经' then
     begin
-      if Trim(WB_MachNo.Text) = '' then
+//      if Trim(WB_MachNo.Text) = '' then
-        raise Exception.Create('迁经机不能为空！');
+//        raise Exception.Create('迁经机不能为空！');
     end;
 
 //    if StrToIntDef(WB_ClothPiece.Text, 0) = 0 then
@@ -526,8 +526,8 @@ procedure TfrmTatWBCardInPut.GYNoPropertiesButtonClick(Sender: TObject; AButtonI
 begin
   inherited;
   try
-    frmTatPlanSel2 := TfrmTatPlanSel2.Create(Application);
+    frmWeaveSel := TfrmWeaveSel.Create(Application);
-    with frmTatPlanSel2 do
+    with frmWeaveSel do
     begin
       FISSJ := '否';
       if ShowModal = 1 then
@@ -574,7 +574,7 @@ begin
       end;
     end;
   finally
-    frmTatPlanSel2.Free;
+    frmWeaveSel.Free;
   end;
 end;
 
@@ -608,6 +608,7 @@ var
   MWBCID: string;
   i, j: integer;
   fDate: string;
+   fMonth: string;
 begin
   if MCardQty = 0 then
     EXIT;
@@ -616,6 +617,7 @@ begin
     ADOQueryCmd.Connection.BeginTrans;
 
     fDate := FormatDateTime('yy', SGetServerDate(ADOQueryTemp));
+    fMonth := FormatDateTime('mm', SGetServerDate(ADOQueryTemp));
 
     with ADOQueryCmd do
     begin
@@ -626,10 +628,11 @@ begin
       sql.Add(' ,WB_Width,WB_ReedNo,WB_ReedNote,WBFtyNo,WBFtyName,WBBelong,WBBelongCoNo,WBBelongCoName  ');
       sql.Add(' ,GYSubid,GYNo,CustNo,CustName,GKBH,C_CODE');
       SQL.Add(' ,BSQTY,DCRQTY,C_KCQTY');
+      SQL.Add(' ,BegDate,F_SJKESHU,F_YarnStripQty,F_YUSHU,ordqty');
       sql.Add(' ) values');
       for i := 1 to MCardQty do
       begin
-        if GetLSNo(ADOQueryTemp, MWBCID, 'JZ' + fDate, 'Tat_WB_Card', 2, 0) = False then
+        if GetLSNo(ADOQueryTemp, MWBCID, 'JZ' + fDate + fMonth, 'Tat_WB_Card', 3, 0) = False then
         begin
           raise Exception.Create('取布票流水号失败!');
         end;
@@ -668,11 +671,65 @@ begin
 
         sql.Add(',' + Quotedstr(Trim(C_CODE.Text)));
 
-        sql.Add(',' + (Trim(BSQTY.Text)));
+        if BSQTY.Text <> '' then
-        sql.Add(',' + (Trim(DCRQTY.Text)));
+        begin
+          sql.Add(',' + (Trim(BSQTY.Text)));
+        end
+        else
+        begin
+          sql.Add(',0');
+        end;
+
+        if DCRQTY.Text <> '' then
+        begin
+          sql.Add(',' + (Trim(DCRQTY.Text)));
+        end
+        else
+        begin
+          sql.Add(',0');
+        end;
+
         sql.Add(',' + Quotedstr(Trim(C_KCQTY.Text)));
 
+        sql.Add(',' + Quotedstr(Trim(BegDate.Text)));
+
+        if F_SJKESHU.Text <> '' then
+        begin
+          sql.Add(',' + (Trim(F_SJKESHU.Text)));
+        end
+        else
+        begin
+          sql.Add(',0');
+        end;
+
+        if F_YarnStripQty.Text <> '' then
+        begin
+          sql.Add(',' + (Trim(F_YarnStripQty.Text)));
+        end
+        else
+        begin
+          sql.Add(',0');
+        end;
+
+        if F_YUSHU.Text <> '' then
+        begin
+          sql.Add(',' + (Trim(F_YUSHU.Text)));
+        end
+        else
+        begin
+          sql.Add(',0');
+        end;
+
+        if ordqty.Text <> '' then
+        begin
+          sql.Add(',' + (Trim(ordqty.Text)));
+        end
+        else
+        begin
+          sql.Add(',0');
+        end;
         sql.Add(' )');
+//        ShowMessage(sql.Text);
       end;
 
       ExecSQL;

E02梭织经轴仓库/U_TatWBCardInPut2.dfm

@@ -984,7 +984,6 @@ inherited frmTatWBCardInPut2: TfrmTatWBCardInPut2
             Kind = bkEllipsis
           end>
         Properties.ReadOnly = True
-        Properties.OnButtonClick = GYNoPropertiesButtonClick
         Style.ButtonStyle = btsDefault
         TabOrder = 8
         OnDblClick = GYNoDblClick

E02梭织经轴仓库/U_TatWBCardInPut2.pas

@@ -171,7 +171,6 @@ type
     procedure TV2Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure TV2Column8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-    procedure GYNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure GYNoDblClick(Sender: TObject);
     procedure GKBHPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
   private
@@ -542,50 +541,6 @@ begin
   TcxButtonEdit(Sender).Text := '';
 end;
 
-procedure TfrmTatWBCardInPut2.GYNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
-begin
-  inherited;
-  try
-    frmTatPlanSel2 := TfrmTatPlanSel2.Create(Application);
-    with frmTatPlanSel2 do
-    begin
-      FISSJ := '·ñ';
-      if ShowModal = 1 then
-      begin
-        Self.GYNo.Text := CDS_1.FieldByName('OrderNo').asstring;
-        Self.GYNo.Properties.LookupItems.Text := CDS_1.FieldByName('Subid').asstring;
-        Self.CustName.Text := CDS_1.FieldByName('CustName').asstring;
-
-        Self.WB_Code.Text := CDS_1.FieldByName('WB_Code').asstring;
-
-        with ADOQueryTemp do
-        begin
-          close;
-          sql.Clear;
-          sql.Add(' select A.* ');
-          sql.Add(' from Tat_WB_Spec A');
-          sql.Add(' where WB_Code=''' + trim(WB_Code.Text) + ''' ');
-          Open;
-        end;
-
-        Self.WB_Code.Text := Trim(ADOQueryTemp.fieldbyname('WB_Code').AsString);
-        Self.WB_Name.Text := Trim(ADOQueryTemp.fieldbyname('WB_Name').AsString);
-        Self.WB_YarnQty.Text := ADOQueryTemp.fieldbyname('WB_YarnQty').asstring;
-
-        Self.WB_Width.Text := Trim(ADOQueryTemp.fieldbyname('WB_Width').AsString);
-        Self.WB_ReedNo.Text := Trim(ADOQueryTemp.fieldbyname('WB_ReedNo').AsString);
-        Self.WB_ReedNote.Text := Trim(ADOQueryTemp.fieldbyname('WB_ReedNote').AsString);
-
-        Self.Note.Text := Trim(ADOQueryTemp.fieldbyname('Note').AsString);
-        Self.InitCard3();
-
-      end;
-    end;
-  finally
-    frmTatPlanSel2.Free;
-  end;
-end;
-
 procedure TfrmTatWBCardInPut2.N2Click(Sender: TObject);
 begin
   SelOKNo(CDS_Card, True);
@@ -646,9 +601,19 @@ begin
       sql.Add(' ) values');
       for i := 1 to MCardQty do
       begin
-        if GetLSNo(ADOQueryTemp, MWBCID, 'XZK' + fDate, 'Tat_WB_Card', 2, 0) = False then
+        if FWB_Type = 'Ï¡Öá' then
         begin
-          raise Exception.Create('È¡²¼Æ±Á÷Ë®ºÅʧ°Ü!');
+          if GetLSNo(ADOQueryTemp, MWBCID, 'XZK' + fDate, 'Tat_WB_Card', 2, 0) = False then
+          begin
+            raise Exception.Create('È¡²¼Æ±Á÷Ë®ºÅʧ°Ü!');
+          end;
+        end
+        else
+        begin
+          if GetLSNo(ADOQueryTemp, MWBCID, 'JZK' + fDate, 'Tat_WB_Card', 2, 0) = False then
+          begin
+            raise Exception.Create('È¡²¼Æ±Á÷Ë®ºÅʧ°Ü!');
+          end;
         end;
 
         if i > 1 then

E02梭织经轴仓库/U_TatWBPlan.dfm

@@ -6,6 +6,7 @@ inherited frmTatWBPlan: TfrmTatWBPlan
   ClientWidth = 1540
   Font.Height = -16
   Position = poScreenCenter
+  ExplicitLeft = -633
   ExplicitWidth = 1556
   ExplicitHeight = 691
   PixelsPerInch = 96
@@ -202,7 +203,7 @@ inherited frmTatWBPlan: TfrmTatWBPlan
       Height = 29
       Date = 40675.000000000000000000
       Format = 'yyyy-MM-dd'
-      Time = 0.464761099538009200
+      Time = 0.464761099538009100
       TabOrder = 1
     end
     object CustName: TEdit
@@ -594,7 +595,7 @@ inherited frmTatWBPlan: TfrmTatWBPlan
       TabOrder = 2
       Properties.CustomButtons.Buttons = <>
       Properties.Style = 6
-      Properties.TabIndex = 0
+      Properties.TabIndex = 1
       Properties.Tabs.Strings = (
         #31232#36724
         #27974#36724)

E02梭织经轴仓库/U_TatWBPlanCard.pas

@@ -420,11 +420,17 @@ begin
 end;
 
 procedure TfrmTatWBPlanCard.ToolButton6Click(Sender: TObject);
+var
+  i: Integer;
 begin
   try
     frmTatWBCardInPut := TfrmTatWBCardInPut.Create(Application);
     with frmTatWBCardInPut do
     begin
+      for i := 0 to frmTatWBCardInPut.panel1.ControlCount - 1 do
+      begin
+        frmTatWBCardInPut.panel1.Controls[i].Enabled := false;
+      end;
       FWBCNO := Trim(Self.CDS_1.fieldbyname('WBCNO').AsString);
       if ShowModal = 1 then
       begin

E02梭织经轴仓库/U_TatWBPlanInPut.dfm

@@ -97,6 +97,8 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut
       Align = alTop
       TabOrder = 1
       Visible = False
+      ExplicitLeft = 2
+      ExplicitTop = 6
       object Panel6: TPanel
         Left = 1
         Top = 1
@@ -169,7 +171,6 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut
       Height = 287
       Align = alClient
       TabOrder = 2
-      ExplicitTop = 47
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
@@ -366,7 +367,6 @@ inherited frmTatWBPlanInPut: TfrmTatWBPlanInPut
     ParentFont = False
     TabOrder = 2
     OnDblClick = gynoDblClick
-    ExplicitTop = 41
     object Label3: TLabel
       Left = 756
       Top = 14

E02梭织经轴仓库/U_TatWBPlanInPut.pas

@@ -153,7 +153,7 @@ implementation
 
 uses
   U_DataLink, U_ZDYHelp, U_RTFun, U_CompanySel, U_YarnInfoSel, U_TatPlanSel2,
-  U_WBSpecSel, U_GKManageSel;
+  U_WBSpecSel, U_GKManageSel, U_WeaveSel;
 
 {$R *.dfm}
 
@@ -231,8 +231,8 @@ end;
 procedure TfrmTatWBPlanInPut.gynoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
-    frmTatPlanSel2 := TfrmTatPlanSel2.Create(Application);
+    frmWeaveSel := TfrmWeaveSel.Create(Application);
-    with frmTatPlanSel2 do
+    with frmWeaveSel do
     begin
 //      FISSJ := '·ñ';
       if ShowModal = 1 then
@@ -324,7 +324,7 @@ begin
       end;
     end;
   finally
-    frmTatPlanSel2.Free;
+    frmWeaveSel.Free;
   end;
   WB_YarnTotalLenExit(Sender);
 end;

E02梭织经轴仓库/U_WeaveSel.pas

@@ -0,0 +1,247 @@
+unit U_WeaveSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, ToolWin, ComCtrls, U_BaseHelp, cxGridCustomTableView,
+  cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
+  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
+  cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
+  System.ImageList, U_BaseInput, cxCheckBox, cxCalendar, dxScrollbarAnnotations,
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinOffice2013White, dxSkinSharpPlus,
+  dxSkinWXI, cxPC;
+
+type
+  TfrmWeaveSel = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    TBSave: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    ADOConnection1: TADOConnection;
+    Panel1: TPanel;
+    GPM_1: TcxGridPopupMenu;
+    ImageList1: TImageList;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
+    Label3: TLabel;
+    Label8: TLabel;
+    Label1: TLabel;
+    OrderNo: TEdit;
+    ConNo: TEdit;
+    CustName: TEdit;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    v1OrderNo: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    v1Column31: TcxGridDBColumn;
+    v1Column5: TcxGridDBColumn;
+    Tv1Column1: TcxGridDBColumn;
+    v1Column19: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    v1PRTMF: TcxGridDBColumn;
+    Tv1Column8: TcxGridDBColumn;
+    Tv1Column5: TcxGridDBColumn;
+    Tv1Column11: TcxGridDBColumn;
+    cxGrid1Level1: TcxGridLevel;
+    Tv1Column7: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    cxTabControl1: TcxTabControl;
+    cxStyle2: TcxStyle;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    procedure FormCreate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure TBSaveClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure OrderNoChange(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure Tv1DblClick(Sender: TObject);
+    procedure cxTabControl1Change(Sender: TObject);
+  private
+    procedure InitGrid();
+    { Private declarations }
+  public
+    FCoType, FAuthority: string;
+    FISSJ: string;
+    { Public declarations }
+  end;
+
+var
+  frmWeaveSel: TfrmWeaveSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmWeaveSel.FormCreate(Sender: TObject);
+begin
+  inherited;
+  try
+    with ADOConnection1 do
+    begin
+      Connected := false;
+      ConnectionString := DConString;
+      Connected := true;
+    end;
+    ADOQueryBaseCmd.Connection := ADOConnection1;
+    ADOQueryBaseTemp.Connection := ADOConnection1;
+  except
+    application.MessageBox('网络连接失败！', '提示信息');
+  end;
+end;
+
+procedure TfrmWeaveSel.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmWeaveSel := nil;
+end;
+
+procedure TfrmWeaveSel.cxTabControl1Change(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmWeaveSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := cahide;
+end;
+
+procedure TfrmWeaveSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add(' select *,PZQty=(select count(*) from Tat_WB_Card X where X.OrderNo =A.OrderNo)');
+      SQL.Add(',apqty=(select sum(WB_YarnLen) from Tat_WB_Card X where X.OrderNo =A.OrderNo)');
+      sql.Add(',ZS=(select ZS from Bs_Cloth_Info X where X.C_Code =B.C_Code)  ');
+      SQL.Add(',ORDQTY2=ROUND(ORDQTY*1.08,2)');
+      sql.Add(',ISSizing=(select ISSizing from Tat_WB_Spec E where E.WB_Code =B.WB_Code)  ');
+      sql.Add(' from Tat_Plan_Main A inner join Tat_Plan_Sub B on A.MainId=B.MainId');
+
+      //SQL.Add(' where  isnull(A.status,''0'')=''9'' ');
+      sql.add('where 1=1');
+      if FISSJ = '否' then   //整经
+      begin
+        sql.add('AND  (select ISSizing from Tat_WB_Spec E where E.WB_Code =B.WB_Code)=''否''');
+        sql.add('AND  (select WB_TYPE from Tat_WB_Spec E where E.WB_Code =B.WB_Code)=''分条''');
+        case cxTabControl1.TabIndex of
+          0:
+            begin
+
+              sql.Add('and not exists (select 1 from Tat_WB_Card X where X.gyno = A.OrderNo)'); //未安排
+
+//              sql.Add('and not exists (select 1 from Tat_WB_Card where gyno = A.OrderNo)'); //未安排
+            end;
+          1:
+            begin
+
+              sql.Add('and  exists (select 1 from Tat_WB_Card X where X.gyno = A.OrderNo)');    //已安排
+
+//              sql.Add('and not exists (select 1 from Tat_WB_Card where gyno = A.OrderNo)');    //已安排
+            end;
+          2:
+            begin
+              sql.Add('and isnull(Status,''0'') not in (''11'',''22'') ');   //全部
+//            sql.Add(' and A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.Date)) + '''');
+//            sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1)) + '''');
+            end;
+        end;
+      end
+      else
+      begin
+        sql.add('AND  (select WB_TYPE from Tat_WB_Spec E where E.WB_Code =B.WB_Code)=''整浆并''');
+        case cxTabControl1.TabIndex of
+          0:
+            begin
+
+//              sql.Add('and not exists (select 1 from Tat_WB_Plan where gyno = A.OrderNo)'); //未安排
+
+              sql.Add('and not exists (select 1 from Tat_WB_Card where gyno = A.OrderNo)'); //未安排
+            end;
+          1:
+            begin
+
+//              sql.Add('and not exists (select 1 from Tat_WB_Plan where gyno = A.OrderNo)');    //已安排
+
+              sql.Add('and exists (select 1 from Tat_WB_Card where gyno = A.OrderNo)');    //已安排
+            end;
+          2:
+            begin
+              sql.Add('and isnull(Status,''0'') not in (''11'',''22'') ');   //全部
+//            sql.Add(' and A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.Date)) + '''');
+//            sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1)) + '''');
+            end;
+        end;
+      end;
+      sql.Add('and isnull(Status,''0'') =''9'' ');
+
+      sql.add('order by A.FILLTIME DESC');
+      Open;
+    end;
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmWeaveSel.OrderNoChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  end;
+end;
+
+procedure TfrmWeaveSel.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid('单位名称1' + Trim(FCoType), TV1, '自定义数据');
+  InitGrid();
+end;
+
+procedure TfrmWeaveSel.TBCloseClick(Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfrmWeaveSel.TBSaveClick(Sender: TObject);
+begin
+  WriteCxGrid('单位名称1' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmWeaveSel.ToolButton1Click(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmWeaveSel.Tv1DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+end.
+

E02梭织经轴仓库/WarpBeamStk.dpr

@@ -68,7 +68,9 @@ uses
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
   U_TatGYSel in '..\E00梭织通用窗体\U_TatGYSel.pas' {frmTatGYSel},
   U_TatPlanSel2 in '..\E00梭织通用窗体\U_TatPlanSel2.pas' {frmTatPlanSel2},
-  U_GKInput in 'U_GKInput.pas' {frmGKInput};
+  U_GKInput in 'U_GKInput.pas' {frmGKInput},
+  U_TatWBPlan in 'U_TatWBPlan.pas' {frmTatWBPlan},
+  U_WeaveSel in 'U_WeaveSel.pas' {frmWeaveSel};
 
 {$R *.res}
 

E02梭织经轴仓库/WarpBeamStk.dproj

@@ -292,6 +292,14 @@
             <Form>frmGKInput</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_TatWBPlan.pas">
+            <Form>frmTatWBPlan</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_WeaveSel.pas">
+            <Form>frmWeaveSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

E02梭织经轴仓库/WarpBeamStk.dproj.local

@@ -125,22 +125,28 @@
     <File Path="U_WBTypeSel.dfm"/>
     <File Path="U_GKInput.pas"/>
     <File Path="U_GKInput.dfm"/>
+    <File Path="U_TatWBPlan.pas"/>
+    <File Path="U_TatWBPlan.dfm"/>
+    <File Path="U_WeaveSel.pas"/>
+    <File Path="U_WeaveSel.dfm"/>
   </ProjectSortOrder>
 	<Transactions>
     <Transaction>1899/12/30 00:00:00.000.535,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.584,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_CZ.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.556,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_SZ.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.585,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XZ.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.922,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.512,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.717,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A02基础产品管理\U_TatClothInfoInput.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.158,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_GKInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.584,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_CZ.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.556,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_SZ.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.158,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.922,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.585,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XZ.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.512,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.dfm</Transaction>
+    <Transaction>2025/08/26 09:25:41.000.108,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlan.pas</Transaction>
+    <Transaction>2025/08/26 09:28:41.000.024,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WeaveSel.pas</Transaction>
   </Transactions>
 </BorlandProject>

E03梭织坯布检验/TatInsp.dproj.local

@@ -1,86 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.636,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp2.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.638,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.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.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.pas</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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.973,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.231,=D:\Dp10RepoV1\项目代码\D10szJinCheng\E03梭织坯布检验\U_ZKJL.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.292,=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.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.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.514,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.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.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.514,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.935,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.935,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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.636,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp2.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.dfm</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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.973,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.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.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.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.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.151,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.436,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.099,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.436,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.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.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm</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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.897,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.636,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.973,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp.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.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.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.897,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.973,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.231,=D:\Dp10RepoV1\项目代码\D10szJinCheng\E03梭织坯布检验\U_ZKJL.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.151,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.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>
+    <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.636,D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E03梭织坯布检验\U_TatMachInsp2.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="android-support-v4.dex.jar"/>
-    <File Path="cloud-messaging.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
-    <File Path="fmx.dex.jar"/>
-    <File Path="google-play-billing.dex.jar"/>
-    <File Path="google-play-licensing.dex.jar"/>
     <File Path="..\..\D10SZKaiXiYa"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>

E03梭织坯布检验/TatInspLogin.dproj.local

@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="android-support-v4.dex.jar"/>
-    <File Path="cloud-messaging.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
-    <File Path="fmx.dex.jar"/>
-    <File Path="google-play-billing.dex.jar"/>
-    <File Path="google-play-licensing.dex.jar"/>
     <File Path="DbPanel"/>
     <File Path="DbPanel\MovePanel.pas"/>
     <File Path="delphitwain"/>
@@ -49,7 +21,7 @@
     <File Path="U_upPassword.dfm"/>
   </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\DyeInspLogin.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInspLogin.dproj</Transaction>
   </Transactions>
 </BorlandProject>