11.16

A00通用窗体/U_SalesContractCPSel.dfm

@@ -71,6 +71,8 @@ inherited frmSalesContractCPSel: TfrmSalesContractCPSel
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 1
+    ExplicitLeft = 8
+    ExplicitTop = 32
     object Label1: TLabel
       Left = 18
       Top = 15
@@ -129,6 +131,7 @@ inherited frmSalesContractCPSel: TfrmSalesContractCPSel
     BorderStyle = cxcbsNone
     PopupMenu = PM_1
     TabOrder = 2
+    ExplicitTop = 88
     object TV1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -337,6 +340,20 @@ inherited frmSalesContractCPSel: TfrmSalesContractCPSel
         Options.Editing = False
         Width = 58
       end
+      object TV1InspStandard: TcxGridDBColumn
+        Caption = #26816#39564#26631#20934
+        DataBinding.FieldName = 'InspStandard'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object TV1InspScore: TcxGridDBColumn
+        Caption = #26816#39564#21512#26684#20998#25968
+        DataBinding.FieldName = 'InspScore'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 118
+      end
       object v1Column2: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'ConSNote'

A00通用窗体/U_SalesContractCPSel.pas

@@ -75,6 +75,8 @@ type
     BuyName: TEdit;
     TV1C_FinishLatitudeDensity: TcxGridDBColumn;
     TV1C_FinishLongitudeDensity: TcxGridDBColumn;
+    TV1InspStandard: TcxGridDBColumn;
+    TV1InspScore: TcxGridDBColumn;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);

A02基础产品管理/ClothInfo.dpr

@@ -57,7 +57,8 @@ uses
   U_WBSpecInPut in 'U_WBSpecInPut.pas' {frmWBSpecInPut},
   U_WBSpecInPut2 in 'U_WBSpecInPut2.pas' {frmWBSpecInPut2},
   U_log in '..\..\..\public10\ThreeFun\Fun\U_log.pas',
-  U_LogInput in 'U_LogInput.pas' {frmLogInput};
+  U_LogInput in 'U_LogInput.pas' {frmLogInput},
+  U_YarnCFInfoSel in '..\B02»ù´¡É´Ïß²Ö¿â\U_YarnCFInfoSel.pas' {frmYarnCFInfoSel};
 
 {$R *.res}
 

A02基础产品管理/ClothInfo.dproj

@@ -221,6 +221,10 @@
             <Form>frmLogInput</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\B02基础纱线仓库\U_YarnCFInfoSel.pas">
+            <Form>frmYarnCFInfoSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

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

@@ -1,82 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <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.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.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.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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.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.208,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\JDAESExtend.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.558,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.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.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.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.630,=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.003,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_InputBoxSingleNumber.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.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.921,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_SysLogHelp.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.048,=D:\Dp10Repo\public10\design\U_BaseList.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.325,=D:\Dp10RepoV1\项目代码\花蝴蝶\A02基础产品管理\U_TatClothInfoInput.pas</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.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.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj</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.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.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.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.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.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.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.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.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.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.243,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\untAES.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.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm</Transaction>
     <Transaction>2025/08/28 09:29:23.000.693,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
     <Transaction>2025/09/24 11:07:38.000.652,=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_log.pas</Transaction>
     <Transaction>2025/09/24 12:20:14.000.487,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_LogInput.pas</Transaction>
+    <Transaction>2025/11/15 16:57:33.302,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_YarnCFInfoSel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10SZKaiXiYa"/>
@@ -126,6 +127,8 @@
     <File Path="..\B02基础纱线仓库"/>
     <File Path="..\B02基础纱线仓库\U_YarnInfoInPut.pas"/>
     <File Path="..\B02基础纱线仓库\U_YarnInfoInPut.dfm"/>
+    <File Path="..\B02基础纱线仓库\U_YarnCFInfoSel.pas"/>
+    <File Path="..\B02基础纱线仓库\U_YarnCFInfoSel.dfm"/>
     <File Path="D:\Dp10RepoV1"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>

A02基础产品管理/U_LogInput.dfm

@@ -60,22 +60,22 @@ inherited frmLogInput: TfrmLogInput
       ImageIndex = 6
       OnClick = TbDelClick
     end
-    object TbSaveFormat: TToolButton
-      Left = 284
-      Top = 0
-      AutoSize = True
-      Caption = #20445#23384#26684#24335
-      ImageIndex = 16
-      OnClick = TbSaveFormatClick
-    end
     object TbSave: TToolButton
-      Left = 387
+      Left = 284
       Top = 0
       AutoSize = True
       Caption = #20445#23384
       ImageIndex = 37
       OnClick = TbSaveClick
     end
+    object TbSaveFormat: TToolButton
+      Left = 355
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = TbSaveFormatClick
+    end
     object TBClose: TToolButton
       Left = 458
       Top = 0

A02基础产品管理/U_TatClothInfoInput.dfm

@@ -9,7 +9,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
   Font.Height = -16
   OldCreateOrder = True
   Position = poScreenCenter
-  ExplicitLeft = -273
   ExplicitWidth = 1556
   ExplicitHeight = 776
   PixelsPerInch = 96
@@ -83,7 +82,8 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
-    ExplicitTop = 36
+    ExplicitLeft = -1
+    ExplicitTop = 24
     object Label1: TLabel
       Left = 10
       Top = 26
@@ -875,7 +875,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     Height = 312
     Align = alClient
     TabOrder = 2
-    Properties.ActivePage = cxTabSheet2
+    Properties.ActivePage = cxTabSheet1
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
     ClientRectBottom = 312
@@ -946,7 +946,6 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
           Align = alClient
           PopupMenu = PM_1
           TabOrder = 1
-          ExplicitLeft = -2
           object TV1: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
             ScrollbarAnnotations.CustomAnnotations = <>

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

@@ -9,8 +9,8 @@
     <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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.325,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
@@ -27,8 +27,8 @@
     <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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</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.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.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.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.526,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.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>
@@ -42,17 +42,17 @@
     <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.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.519,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.582,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.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.242,=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.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.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>
@@ -61,7 +61,7 @@
     <Transaction>1899/12/30 00:00:00.000.690,=D:\Dp10RepoV1\项目代码\D10szJinCheng\A00通用组件\FrameDateSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.993,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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>

B01基础合同管理/U_GetDllForm.pas

@@ -77,6 +77,7 @@ begin
     pswd := 'rightsoft,.KXY@YN';
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
     Parameters1 := '¹ÜÀí';
+//    Parameters1 := '²éѯ';
   end
   else
   begin

B01基础合同管理/U_SalesConInPut.dfm

@@ -10,7 +10,6 @@ inherited frmSalesConInPut: TfrmSalesConInPut
   OldCreateOrder = True
   Position = poScreenCenter
   WindowState = wsMaximized
-  ExplicitLeft = -589
   ExplicitWidth = 1522
   ExplicitHeight = 787
   PixelsPerInch = 96

B01基础合同管理/U_SalesConInPut.pas

@@ -1148,6 +1148,8 @@ begin
       if ShowModal = 1 then
       begin
         Self.BuyConNo.Text := frmSalesContractCPSel.CDS_1.fieldbyname('ConNO').asString;
+        Self.InspStandard.Text := frmSalesContractCPSel.CDS_1.fieldbyname('InspStandard').asString;
+        Self.InspScore.Text := frmSalesContractCPSel.CDS_1.fieldbyname('InspScore').asString;
 //        Self.BuyName.Text := frmSalesContractCPSel.CDS_1.fieldbyname('BuyName').asString;
         with CDS_1 do
         begin

B01基础合同管理/U_SalesContractList.dfm

@@ -7,7 +7,6 @@ inherited frmSalesContractList: TfrmSalesContractList
   Font.Height = -16
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -689
   ExplicitWidth = 1556
   ExplicitHeight = 810
   PixelsPerInch = 96
@@ -187,6 +186,7 @@ inherited frmSalesContractList: TfrmSalesContractList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
+    ExplicitLeft = -1
     ExplicitTop = 159
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
@@ -468,6 +468,145 @@ inherited frmSalesContractList: TfrmSalesContractList
         HeaderAlignmentHorz = taCenter
         Width = 105
       end
+      object Tv1C_Code: TcxGridDBColumn
+        Caption = #20135#21697#32534#21495
+        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_Name: TcxGridDBColumn
+        Caption = #20135#21697#21517#31216
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_Spec: TcxGridDBColumn
+        Caption = #35268#26684
+        DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_Composition: TcxGridDBColumn
+        Caption = #25104#20998
+        DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_Color: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_ColorNo: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_StyleNo: TcxGridDBColumn
+        Caption = #27454#21495
+        DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_Pattern: TcxGridDBColumn
+        Caption = #33457#22411
+        DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_FinishLongitudeDensity: TcxGridDBColumn
+        Caption = #32463#23494
+        DataBinding.FieldName = 'C_FinishLongitudeDensity'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_FinishLatitudeDensity: TcxGridDBColumn
+        Caption = #32428#23494
+        DataBinding.FieldName = 'C_FinishLatitudeDensity'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_Width: TcxGridDBColumn
+        Caption = #22383#24067#38376#24133
+        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1C_GramWeight: TcxGridDBColumn
+        Caption = #22383#24067#20811#37325
+        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1ConQty: TcxGridDBColumn
+        Caption = #22383#24067#25968#37327
+        DataBinding.FieldName = 'ConQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1ConUnit: TcxGridDBColumn
+        Caption = #21333#20301
+        DataBinding.FieldName = 'ConUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+      end
+      object Tv1ConPrice: TcxGridDBColumn
+        Caption = #21333#20215
+        DataBinding.FieldName = 'ConPrice'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1ConTotalAmount: TcxGridDBColumn
+        Caption = #37329#39069
+        DataBinding.FieldName = 'ConTotalAmount'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1ConSNote: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'ConSNote'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1JHDate: TcxGridDBColumn
+        Caption = #20132#26399
+        DataBinding.FieldName = 'JHDate'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1YDZ: TcxGridDBColumn
+        Caption = #28322#30701#35013
+        DataBinding.FieldName = 'YDZ'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1AttName: TcxGridDBColumn
+        Caption = #22270#29255
+        DataBinding.FieldName = 'AttName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -617,6 +756,7 @@ inherited frmSalesContractList: TfrmSalesContractList
     Align = alBottom
     Caption = 'Panel2'
     TabOrder = 5
+    Visible = False
     object cxGrid2: TcxGrid
       Left = 1
       Top = 1
@@ -625,6 +765,8 @@ inherited frmSalesContractList: TfrmSalesContractList
       Align = alClient
       BorderStyle = cxcbsNone
       TabOrder = 0
+      ExplicitLeft = 0
+      ExplicitTop = 6
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>

B01基础合同管理/U_SalesContractList.pas

@@ -133,6 +133,26 @@ type
     TV2C_FinishLongitudeDensity: TcxGridDBColumn;
     Tv1InspStandard: TcxGridDBColumn;
     Tv1InspScore: TcxGridDBColumn;
+    Tv1C_Code: TcxGridDBColumn;
+    Tv1C_Name: TcxGridDBColumn;
+    Tv1C_Spec: TcxGridDBColumn;
+    Tv1C_Composition: TcxGridDBColumn;
+    Tv1C_Color: TcxGridDBColumn;
+    Tv1C_ColorNo: TcxGridDBColumn;
+    Tv1C_StyleNo: TcxGridDBColumn;
+    Tv1C_Pattern: TcxGridDBColumn;
+    Tv1C_FinishLongitudeDensity: TcxGridDBColumn;
+    Tv1C_FinishLatitudeDensity: TcxGridDBColumn;
+    Tv1C_Width: TcxGridDBColumn;
+    Tv1C_GramWeight: TcxGridDBColumn;
+    Tv1ConQty: TcxGridDBColumn;
+    Tv1ConUnit: TcxGridDBColumn;
+    Tv1ConPrice: TcxGridDBColumn;
+    Tv1ConTotalAmount: TcxGridDBColumn;
+    Tv1ConSNote: TcxGridDBColumn;
+    Tv1JHDate: TcxGridDBColumn;
+    Tv1YDZ: TcxGridDBColumn;
+    Tv1AttName: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -210,20 +230,20 @@ end;
 
 procedure TfrmSalesContractList.InitSub();
 begin
-  if CDS_1.IsEmpty then
+//  if CDS_1.IsEmpty then
-    exit;
+//    exit;
-  with ADOQueryTemp do
+//  with ADOQueryTemp do
-  begin
+//  begin
-    close;
+//    close;
-    sql.Clear;
+//    sql.Clear;
-    sql.Add('select * from BS_Contract_sub A  ');
+//    sql.Add('select * from BS_Contract_sub A  ');
-    sql.Add('where ConMID =' + quotedstr((CDS_1.fieldbyname('ConMID').AsString)));
+//    sql.Add('where ConMID =' + quotedstr((CDS_1.fieldbyname('ConMID').AsString)));
-    open;
+//    open;
-  end;
+//  end;
-  SCreateCDS(ADOQueryTemp, CDS_2);
+//  SCreateCDS(ADOQueryTemp, CDS_2);
-  SInitCDSData(ADOQueryTemp, CDS_2);
+//  SInitCDSData(ADOQueryTemp, CDS_2);
-
+//
-  TV2.DataController.Filter.Clear;
+//  TV2.DataController.Filter.Clear;
 end;
 
 procedure TfrmSalesContractList.N1Click(Sender: TObject);
@@ -398,8 +418,9 @@ begin
       Close;
       sql.Clear;
 
-      sql.Add('select AA.* from (select A.*');
+      sql.Add('select AA.*,B.* from (select A.*');
       sql.Add(' from BS_Contract_Main A ) AA  ');
+      sql.Add(' right join BS_Contract_Sub B  on AA.ConMID = B.ConMID  ');
       sql.Add('where 1=1 ' + (WSql));
       sql.Add(' and AA.ConType in (''ÄÚÏú'',''ÍâÏú'') ');
 

B01基础合同管理/U_finishSalesConInput.dfm

@@ -10,7 +10,6 @@ inherited frmfinishSalesConInput: TfrmfinishSalesConInput
   OldCreateOrder = True
   Position = poScreenCenter
   WindowState = wsMaximized
-  ExplicitLeft = -679
   ExplicitWidth = 1546
   ExplicitHeight = 787
   PixelsPerInch = 96
@@ -70,7 +69,6 @@ inherited frmfinishSalesConInput: TfrmfinishSalesConInput
     ParentColor = False
     ParentCtl3D = False
     TabOrder = 1
-    ExplicitTop = 36
     object Label3: TLabel
       Left = 362
       Top = 65
@@ -255,7 +253,7 @@ inherited frmfinishSalesConInput: TfrmfinishSalesConInput
     object InspScore: TcxTextEdit
       Tag = 2
       Left = 835
-      Top = 59
+      Top = 62
       TabOrder = 9
       Width = 237
     end

B01基础合同管理/U_finishSalesContractList.dfm

@@ -7,6 +7,7 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
   Font.Height = -16
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -689
   ExplicitWidth = 1556
   ExplicitHeight = 810
   PixelsPerInch = 96
@@ -161,16 +162,24 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
       ImageIndex = 11
       OnClick = TnoqxClick
     end
-    object ToolButton7: TToolButton
+    object TbDel: TToolButton
       Left = 1176
       Top = 0
       AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 5
+      OnClick = TbDelClick
+    end
+    object ToolButton7: TToolButton
+      Left = 1239
+      Top = 0
+      AutoSize = True
       Caption = #20445#23384#26684#24335
       ImageIndex = 16
       OnClick = ToolButton7Click
     end
     object ToolButton3: TToolButton
-      Left = 1263
+      Left = 1326
       Top = 0
       AutoSize = True
       Caption = #23548#20837
@@ -178,7 +187,7 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
       OnClick = ToolButton3Click
     end
     object TBClose: TToolButton
-      Left = 1326
+      Left = 1389
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -194,7 +203,6 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
-    ExplicitTop = 163
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -299,6 +307,7 @@ inherited frmfinishSalesContractList: TfrmfinishSalesContractList
     Color = clWhite
     ParentBackground = False
     TabOrder = 6
+    ExplicitLeft = 1
     ExplicitTop = 36
     object Label4: TLabel
       Left = 268

B01基础合同管理/U_finishSalesContractList.pas

@@ -114,6 +114,7 @@ type
     TV2ConTotalAmount: TcxGridDBColumn;
     Tv1InspStandard: TcxGridDBColumn;
     Tv1InspScore: TcxGridDBColumn;
+    TbDel: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -152,6 +153,7 @@ type
     procedure N6Click(Sender: TObject);
     procedure TV2FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
     procedure ToolButton3Click(Sender: TObject);
+    procedure TbDelClick(Sender: TObject);
   private
     fFlileFlag: string;
     procedure InitGrid();
@@ -257,6 +259,7 @@ begin
   btnCXTijiao.Enabled := False;
   btnWC.Enabled := False;
   btnWCCX.Enabled := False;
+  TbDel.Enabled := False;
   if Trim(FAuthority) = '¼Èë' then
   begin
     ToolButton2.Enabled := true;
@@ -285,6 +288,7 @@ begin
       4:
         begin
           TNoqx.Enabled := True;
+          TbDel.Enabled := True;
         end;
     end;
   end;
@@ -317,6 +321,7 @@ begin
       4:
         begin
           TNoqx.Enabled := true;
+          TbDel.Enabled := True;
         end;
     end;
   end;
@@ -351,6 +356,65 @@ begin
   Close;
 end;
 
+procedure TfrmfinishSalesContractList.TbDelClick(Sender: TObject);
+var
+  MConMIDS: string;
+begin
+  if CDS_1.IsEmpty then
+    exit;
+  if not CDS_1.Locate('SSel', True, []) then
+  begin
+    application.MessageBox('请选择数据', '提示');
+    Exit;
+  end;
+  with CDS_1 do
+  begin
+    DisableControls;
+    First;
+    MConMIDS := '';
+    while not eof do
+    begin
+      if fieldbyname('SSel').AsBoolean then
+      begin
+        MConMIDS := MConMIDS + trim(fieldbyname('ConMID').AsString) + ',';
+      end;
+      next;
+    end;
+    MConMIDS := copy(MConMIDS, 1, Length(MConMIDS) - 1);
+    EnableControls;
+  end;
+
+  try
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add(' exec P_CP_Contract_Del ');
+      sql.Add(' @ConMIDS=' + QuotedStr(MConMIDS));
+      Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
+      Sql.Add(',@DName=' + quotedstr(Trim(DName)));
+
+      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('合同ID：' + trim(MConMIDS))));
+      sql.Add(',' + quotedstr(trim('成功')));
+      sql.Add(')');
+      open;
+    end;
+    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
+      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+    application.MessageBox('删除成功', '提示');
+    InitGrid();
+  except
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+    InitGrid();
+  end;
+
+end;
+
 procedure TfrmfinishSalesContractList.InitGrid();
 var
   WSql: string;

B02基础纱线仓库/U_YarnCFInfoSel.pas

@@ -0,0 +1,267 @@
+unit U_YarnCFInfoSel;
+
+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, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit,
+  cxDropDownEdit, dxScrollbarAnnotations, cxCheckBox;
+
+type
+  TfrmYarnCFInfoSel = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    TBSaveForMat: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    ADOConnection1: TADOConnection;
+    Panel1: TPanel;
+    Label1: TLabel;
+    CF: TEdit;
+    GPM_1: TcxGridPopupMenu;
+    ImageList1: TImageList;
+    ThreeColorBase: TcxStyleRepository;
+    SHuangSe: TcxStyle;
+    SkyBlue: TcxStyle;
+    Default: TcxStyle;
+    QHuangSe: TcxStyle;
+    Red: TcxStyle;
+    FontBlue: TcxStyle;
+    TextSHuangSe: TcxStyle;
+    FonePurple: TcxStyle;
+    FoneClMaroon: TcxStyle;
+    FoneRed: TcxStyle;
+    RowColor: TcxStyle;
+    handBlack: TcxStyle;
+    cxBlue: TcxStyle;
+    SHuangSeCu: TcxStyle;
+    cxGrid2: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    Tv1Column2: TcxGridDBColumn;
+    v2Column1: TcxGridDBColumn;
+    cxGrid2Level1: TcxGridLevel;
+    Tv1Column4: TcxGridDBColumn;
+    ToolButton2: TToolButton;
+    ToolButton3: TToolButton;
+    TbSave: TToolButton;
+    Tv1SSel: TcxGridDBColumn;
+    procedure FormCreate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure TBSaveForMatClick(Sender: TObject);
+    procedure TV1DblClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure CFChange(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure TbSaveClick(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+  private
+    procedure InitGrid();
+    function SaveData(): Boolean;
+    { Private declarations }
+  public
+    FSTKName: string;
+    { Public declarations }
+  end;
+
+var
+  frmYarnCFInfoSel: TfrmYarnCFInfoSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmYarnCFInfoSel.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 TfrmYarnCFInfoSel.CFChange(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 TfrmYarnCFInfoSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  CF.SetFocus;
+
+  Action := cahide;
+end;
+
+procedure TfrmYarnCFInfoSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('SELECT A.*');
+      SQL.Add('FROM BS_Yarn_Info_CF A');
+      SQL.Add('WHERE A.BYIID IS NULL');
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmYarnCFInfoSel.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid('纱线成分选择' + Trim(FSTKName), TV1, '纱线成分选择');
+  InitGrid();
+end;
+
+procedure TfrmYarnCFInfoSel.TBCloseClick(Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfrmYarnCFInfoSel.TbSaveClick(Sender: TObject);
+begin
+  if SaveData() then
+  begin
+    Application.MessageBox('保存成功！', '提示信息', MB_OK);
+  end;
+
+end;
+
+function TfrmYarnCFInfoSel.SaveData(): Boolean;
+var
+  maxCFID: string;
+begin
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+      //////////////////       保存成分表          //////////////////////
+    with CDS_1 do
+    begin
+      First;
+      while not Eof do
+      begin
+
+        if Trim(CDS_1.fieldbyname('CFID').AsString) = '' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxCFID, 'CF', 'BS_Yarn_Info_CF', 5, 1) = False then
+          begin
+            ADOQueryCmd.Connection.RollbackTrans;
+            Application.MessageBox('取配比子流水号失败！', '提示', 0);
+            Exit;
+          end;
+
+          with ADOQueryCmd do
+          begin
+            Close;
+            SQL.Clear;
+            sql.Add('select * from BS_Yarn_Info_CF where 1 = 2 ');
+            Open;
+          end;
+          with ADOQueryCmd do
+          begin
+            if Trim(CDS_1.fieldbyname('CFID').AsString) = '' then
+            begin
+              Append;
+
+            end;
+            FieldByName('CFID').Value := Trim(maxCFID);
+            RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'BS_Yarn_Info_CF', 0);
+            Post;
+          end;
+
+        end;
+        Next;
+      end;
+    end;
+////////////////       保存成分表结束          //////////////////////
+
+
+    ADOQueryCmd.Connection.CommitTrans;
+    Result := True;
+  except
+    Result := False;
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+  end;
+
+end;
+
+procedure TfrmYarnCFInfoSel.TBSaveForMatClick(Sender: TObject);
+begin
+  WriteCxGrid('纱线成分选择' + Trim(FSTKName), TV1, '纱线成分选择');
+end;
+
+procedure TfrmYarnCFInfoSel.ToolButton1Click(Sender: TObject);
+begin
+  CF.SetFocus;
+  ModalResult := 1;
+end;
+
+procedure TfrmYarnCFInfoSel.ToolButton2Click(Sender: TObject);
+begin
+  CDS_1.Append;
+  CDS_1.FieldByName('SSel').Value := False;
+  CDS_1.Post;
+end;
+
+procedure TfrmYarnCFInfoSel.ToolButton3Click(Sender: TObject);
+begin
+  if CDS_1.FieldByName('CFID').AsString <> '' then
+  begin
+     Application.MessageBox('已保存成分不能删除！','提示信息',MB_OK);
+     exit;
+  end
+  else
+  begin
+     CDS_1.Delete;
+  end;
+end;
+
+procedure TfrmYarnCFInfoSel.TV1DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmYarnCFInfoSel.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmYarnCFInfoSel := nil;
+end;
+
+end.
+

B02基础纱线仓库/U_YarnInfoInPut.dfm

@@ -2,13 +2,13 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
   Left = 88
   Top = 141
   Caption = #32433#32447#20449#24687#24405#20837
-  ClientHeight = 586
+  ClientHeight = 584
   ClientWidth = 1268
   Color = clWhite
   Font.Height = -16
   Position = poMainFormCenter
   ExplicitWidth = 1284
-  ExplicitHeight = 625
+  ExplicitHeight = 623
   PixelsPerInch = 96
   TextHeight = 21
   object ToolBar1: TToolBar [0]
@@ -61,8 +61,8 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     Left = 0
     Top = 30
     Width = 1268
-    Height = 556
+    Height = 307
-    Align = alClient
+    Align = alTop
     BevelInner = bvNone
     BevelOuter = bvNone
     BorderStyle = bsNone
@@ -77,35 +77,9 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
-    object Label2: TLabel
-      Left = 16
-      Top = 159
-      Width = 32
-      Height = 21
-      Caption = #31867#22411
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = []
-      ParentFont = False
-    end
-    object Label6: TLabel
-      Left = 16
-      Top = 243
-      Width = 32
-      Height = 21
-      Caption = #21697#29260
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = []
-      ParentFont = False
-    end
     object Label7: TLabel
-      Left = 18
+      Left = 10
-      Top = 372
+      Top = 204
       Width = 32
       Height = 21
       Caption = #22791#27880
@@ -142,19 +116,6 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Font.Style = []
       ParentFont = False
     end
-    object Label4: TLabel
-      Left = 16
-      Top = 74
-      Width = 32
-      Height = 21
-      Caption = #35268#26684
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = []
-      ParentFont = False
-    end
     object Label8: TLabel
       Left = 406
       Top = 72
@@ -170,7 +131,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label9: TLabel
       Left = 406
-      Top = 201
+      Top = 110
       Width = 32
       Height = 21
       Caption = #39068#33394
@@ -182,8 +143,8 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       ParentFont = False
     end
     object Label5: TLabel
-      Left = 16
+      Left = 17
-      Top = 116
+      Top = 76
       Width = 32
       Height = 21
       Caption = #25104#20998
@@ -195,8 +156,8 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       ParentFont = False
     end
     object Label10: TLabel
-      Left = 406
+      Left = 17
-      Top = 159
+      Top = 145
       Width = 32
       Height = 21
       Caption = #32442#27861
@@ -207,22 +168,9 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Font.Style = []
       ParentFont = False
     end
-    object Label11: TLabel
-      Left = 16
-      Top = 201
-      Width = 32
-      Height = 21
-      Caption = #25467#24230
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = []
-      ParentFont = False
-    end
     object Label12: TLabel
-      Left = 406
+      Left = 17
-      Top = 116
+      Top = 111
       Width = 32
       Height = 21
       Caption = #25903#25968
@@ -233,45 +181,6 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Font.Style = []
       ParentFont = False
     end
-    object Label13: TLabel
-      Left = 406
-      Top = 243
-      Width = 64
-      Height = 21
-      Caption = #26631#26679#26085#26399
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = []
-      ParentFont = False
-    end
-    object Label14: TLabel
-      Left = 16
-      Top = 290
-      Width = 32
-      Height = 21
-      Caption = #21378#23478
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = []
-      ParentFont = False
-    end
-    object Label15: TLabel
-      Left = 406
-      Top = 290
-      Width = 64
-      Height = 21
-      Caption = #29702#35770#25439#32791
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = []
-      ParentFont = False
-    end
     object Label16: TLabel
       Left = 796
       Top = 34
@@ -285,34 +194,6 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Font.Style = []
       ParentFont = False
     end
-    object Label17: TLabel
-      Left = 17
-      Top = 337
-      Width = 64
-      Height = 21
-      Caption = #32433#32447#31995#25968
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #24494#36719#38597#40657
-      Font.Style = []
-      ParentFont = False
-    end
-    object Brand: TcxTextEdit
-      Tag = 2
-      Left = 86
-      Top = 239
-      ParentColor = True
-      ParentFont = False
-      Style.Font.Charset = GB2312_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -16
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = []
-      Style.IsFontAssigned = True
-      TabOrder = 0
-      Width = 300
-    end
     object Y_Name: TcxTextEdit
       Tag = 2
       Left = 86
@@ -325,7 +206,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Style.Font.Name = #24494#36719#38597#40657
       Style.Font.Style = []
       Style.IsFontAssigned = True
-      TabOrder = 1
+      TabOrder = 0
       OnClick = Y_NameClick
       OnExit = Y_NameExit
       Width = 300
@@ -343,7 +224,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Style.Font.Name = #24494#36719#38597#40657
       Style.Font.Style = []
       Style.IsFontAssigned = True
-      TabOrder = 2
+      TabOrder = 1
       Width = 300
     end
     object Denier: TcxTextEdit
@@ -359,15 +240,15 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Style.Font.Name = #24494#36719#38597#40657
       Style.Font.Style = []
       Style.IsFontAssigned = True
-      TabOrder = 3
+      TabOrder = 2
       OnClick = DenierClick
       OnExit = DenierExit
       Width = 300
     end
     object Note: TcxMemo
       Tag = 2
-      Left = 87
+      Left = 79
-      Top = 372
+      Top = 204
       ParentColor = True
       ParentFont = False
       Style.Font.Charset = GB2312_CHARSET
@@ -376,14 +257,14 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Style.Font.Name = #24494#36719#38597#40657
       Style.Font.Style = []
       Style.IsFontAssigned = True
-      TabOrder = 4
+      TabOrder = 3
       Height = 89
       Width = 702
     end
     object FF: TcxTextEdit
       Tag = 2
-      Left = 487
+      Left = 87
-      Top = 155
+      Top = 142
       ParentColor = True
       ParentFont = False
       Properties.OnChange = FFPropertiesChange
@@ -393,28 +274,13 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Style.Font.Name = #24494#36719#38597#40657
       Style.Font.Style = []
       Style.IsFontAssigned = True
-      TabOrder = 5
+      TabOrder = 4
-      Width = 300
-    end
-    object ND: TcxTextEdit
-      Tag = 2
-      Left = 86
-      Top = 194
-      ParentColor = True
-      ParentFont = False
-      Style.Font.Charset = GB2312_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -16
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = []
-      Style.IsFontAssigned = True
-      TabOrder = 6
       Width = 300
     end
     object ZS: TcxTextEdit
       Tag = 2
-      Left = 487
+      Left = 87
-      Top = 112
+      Top = 107
       ParentColor = True
       ParentFont = False
       Properties.OnChange = ZSPropertiesChange
@@ -425,30 +291,15 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Style.Font.Name = #24494#36719#38597#40657
       Style.Font.Style = []
       Style.IsFontAssigned = True
-      TabOrder = 7
+      TabOrder = 5
       OnClick = ZSClick
       OnExit = ZSExit
       Width = 300
     end
-    object BYDate: TcxDateEdit
-      Tag = 2
-      Left = 487
-      Top = 239
-      ParentFont = False
-      Properties.ShowTime = False
-      Style.Font.Charset = GB2312_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -16
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = []
-      Style.IsFontAssigned = True
-      TabOrder = 8
-      Width = 300
-    end
     object Y_Color: TcxButtonEdit
       Tag = 2
       Left = 487
-      Top = 194
+      Top = 104
       Hint = 'Y_Color/'#39068#33394
       ParentFont = False
       Properties.Buttons = <
@@ -466,38 +317,14 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Style.Font.Style = []
       Style.ButtonStyle = btsDefault
       Style.IsFontAssigned = True
-      TabOrder = 9
+      TabOrder = 6
-      OnDblClick = Y_ColorDblClick
-      Width = 300
-    end
-    object Y_Type: TcxButtonEdit
-      Tag = 2
-      Left = 86
-      Top = 155
-      Hint = 'Y_Type/'#31867#22411
-      ParentFont = False
-      Properties.Buttons = <
-        item
-          Default = True
-          Kind = bkEllipsis
-        end>
-      Properties.ReadOnly = True
-      Properties.OnButtonClick = ParentCoNamePropertiesButtonClick
-      Style.Font.Charset = GB2312_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -16
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = []
-      Style.ButtonStyle = btsDefault
-      Style.IsFontAssigned = True
-      TabOrder = 10
       OnDblClick = Y_ColorDblClick
       Width = 300
     end
     object Y_Composition: TcxButtonEdit
       Tag = 2
-      Left = 86
+      Left = 87
-      Top = 112
+      Top = 72
       Hint = 'Y_Composition/'#25104#20998
       ParentFont = False
       Properties.Buttons = <
@@ -515,86 +342,108 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       Style.Font.Style = []
       Style.ButtonStyle = btsDefault
       Style.IsFontAssigned = True
-      TabOrder = 11
+      TabOrder = 7
       OnDblClick = Y_ColorDblClick
       Width = 300
     end
-    object Y_Spec: TcxButtonEdit
-      Tag = 2
-      Left = 86
-      Top = 70
-      Hint = 'Y_Spec/'#35268#26684
-      ParentFont = False
-      Properties.Buttons = <
-        item
-          Default = True
-          Kind = bkEllipsis
-        end>
-      Properties.ReadOnly = True
-      Properties.OnButtonClick = ParentCoNamePropertiesButtonClick
-      Style.Font.Charset = GB2312_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -16
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = []
-      Style.ButtonStyle = btsDefault
-      Style.IsFontAssigned = True
-      TabOrder = 12
-      OnDblClick = Y_ColorDblClick
-      Width = 300
   end
-    object CJ: TcxButtonEdit
+  object ToolBar2: TToolBar [2]
+    Tag = 1
+    Left = 0
+    Top = 337
+    Width = 1268
+    Height = 31
+    ButtonHeight = 30
+    ButtonWidth = 67
+    Caption = 'ToolBar3'
+    Images = cxImageList_bar
+    List = True
+    ShowCaptions = True
+    TabOrder = 2
+    Transparent = True
+    object TbAdd: TToolButton
       Tag = 2
-      Left = 87
+      Left = 0
-      Top = 288
+      Top = 0
-      ParentFont = False
+      AutoSize = True
-      Properties.Buttons = <
+      Caption = #22686#34892
-        item
+      ImageIndex = 2
-          Default = True
+      OnClick = TbAddClick
-          Kind = bkEllipsis
-        end>
-      Properties.ReadOnly = True
-      Properties.OnButtonClick = CJPropertiesButtonClick
-      Properties.OnChange = CJPropertiesChange
-      Style.Font.Charset = GB2312_CHARSET
-      Style.Font.Color = clWindowText
-      Style.Font.Height = -16
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = []
-      Style.ButtonStyle = btsDefault
-      Style.IsFontAssigned = True
-      TabOrder = 13
-      Width = 300
     end
-    object LLSH: TcxTextEdit
+    object TbDel: TToolButton
       Tag = 2
-      Left = 487
+      Left = 71
-      Top = 286
+      Top = 0
-      ParentColor = True
+      AutoSize = True
-      ParentFont = False
+      Caption = #21024#34892
-      Style.Font.Charset = GB2312_CHARSET
+      ImageIndex = 6
-      Style.Font.Color = clWindowText
+      OnClick = TbDelClick
-      Style.Font.Height = -16
-      Style.Font.Name = #24494#36719#38597#40657
-      Style.Font.Style = []
-      Style.IsFontAssigned = True
-      TabOrder = 14
-      Width = 300
     end
-    object YarnFactor: TcxTextEdit
+  end
-      Tag = 2
+  object cxGrid1: TcxGrid [3]
-      Left = 87
+    Left = 0
-      Top = 330
+    Top = 368
-      ParentColor = True
+    Width = 1268
-      ParentFont = False
+    Height = 216
-      Style.Font.Charset = GB2312_CHARSET
+    Align = alClient
-      Style.Font.Color = clWindowText
+    TabOrder = 3
-      Style.Font.Height = -16
+    object Tv1: TcxGridDBTableView
-      Style.Font.Name = #24494#36719#38597#40657
+      Navigator.Buttons.CustomButtons = <>
-      Style.Font.Style = []
+      ScrollbarAnnotations.CustomAnnotations = <>
-      Style.IsFontAssigned = True
+      DataController.DataSource = DS_1
-      TabOrder = 15
+      DataController.Summary.DefaultGroupSummaryItems = <>
-      Width = 300
+      DataController.Summary.FooterSummaryItems = <>
+      DataController.Summary.SummaryGroups = <>
+      OptionsView.GroupByBox = False
+      object Tv1CFID: TcxGridDBColumn
+        Tag = 99
+        DataBinding.FieldName = 'CFID'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1BYIID: TcxGridDBColumn
+        Tag = 99
+        DataBinding.FieldName = 'BYIID'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1serialno: TcxGridDBColumn
+        Caption = #24207#21495
+        DataBinding.FieldName = 'serialno'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1DH: TcxGridDBColumn
+        Caption = #20195#21495
+        DataBinding.FieldName = 'DH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1CF: TcxGridDBColumn
+        Caption = #21517#31216
+        DataBinding.FieldName = 'CF'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1BL: TcxGridDBColumn
+        Caption = #27604#20363
+        DataBinding.FieldName = 'BL'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.OnEditValueChanged = TextEdit
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+    end
+    object cxGrid1Level1: TcxGridLevel
+      GridView = Tv1
     end
   end
   inherited ADOQueryBaseCmd: TADOQuery
@@ -642,4 +491,15 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     Left = 968
     Top = 80
   end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 336
+    Top = 456
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 440
+    Top = 456
+  end
 end

B02基础纱线仓库/U_YarnInfoInPut.pas

@@ -13,7 +13,7 @@ uses
   dxBarBuiltInMenu, U_BaseInput, U_BaseList, System.ImageList, Vcl.ImgList,
   cxContainer, cxMaskEdit, cxMemo, cxImageList, dxSkinsCore,
   dxSkinsDefaultPainters, dxCore, cxDateUtils, dxSkinOffice2013White,
-  dxSkinSharpPlus, dxSkinWXI;
+  dxSkinSharpPlus, dxSkinWXI, dxScrollbarAnnotations, cxCheckBox;
 
 type
   TfrmYarnInfoInPut = class(TfrmBaseInput)
@@ -25,15 +25,11 @@ type
     ADOQueryTemp: TADOQuery;
     ToolButton1: TToolButton;
     ScrollBox1: TScrollBox;
-    Label2: TLabel;
-    Label6: TLabel;
     Label7: TLabel;
     Label1: TLabel;
-    Brand: TcxTextEdit;
     Y_Name: TcxTextEdit;
     Label3: TLabel;
     Y_Code: TcxTextEdit;
-    Label4: TLabel;
     Label8: TLabel;
     Denier: TcxTextEdit;
     Label9: TLabel;
@@ -42,23 +38,25 @@ type
     ADOConnection1: TADOConnection;
     Label10: TLabel;
     FF: TcxTextEdit;
-    Label11: TLabel;
-    ND: TcxTextEdit;
     Label12: TLabel;
     ZS: TcxTextEdit;
-    Label13: TLabel;
-    BYDate: TcxDateEdit;
     Y_Color: TcxButtonEdit;
-    Y_Type: TcxButtonEdit;
     Y_Composition: TcxButtonEdit;
-    Y_Spec: TcxButtonEdit;
-    Label14: TLabel;
-    CJ: TcxButtonEdit;
-    Label15: TLabel;
-    LLSH: TcxTextEdit;
     Label16: TLabel;
-    Label17: TLabel;
+    ToolBar2: TToolBar;
-    YarnFactor: TcxTextEdit;
+    TbAdd: TToolButton;
+    TbDel: TToolButton;
+    Tv1: TcxGridDBTableView;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid1: TcxGrid;
+    Tv1DH: TcxGridDBColumn;
+    Tv1CF: TcxGridDBColumn;
+    Tv1BL: TcxGridDBColumn;
+    CDS_1: TClientDataSet;
+    DS_1: TDataSource;
+    Tv1serialno: TcxGridDBColumn;
+    Tv1CFID: TcxGridDBColumn;
+    Tv1BYIID: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -81,10 +79,14 @@ type
     procedure Y_ColorPropertiesChange(Sender: TObject);
     procedure FFPropertiesChange(Sender: TObject);
     procedure CJPropertiesChange(Sender: TObject);
+    procedure TbAddClick(Sender: TObject);
+    procedure TbDelClick(Sender: TObject);
+    procedure TextEdit(Sender: TObject);
   private
     { Private declarations }
     function SaveData(): Boolean;
     procedure UpdateYarnName;
+    procedure initCFGrid();
   public
     { Public declarations }
     FBYIID, FSTKName: string;
@@ -96,7 +98,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel;    //, U_ProductInfoSel
+  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_YarnCFInfoSel;    //, U_ProductInfoSel
 
 {$R *.dfm}
 
@@ -110,7 +112,7 @@ begin
 
       if ShowModal = 1 then
       begin
-        self.CJ.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString);
+
       end;
     end;
   finally
@@ -150,9 +152,24 @@ begin
   Action := caFree;
 end;
 
+procedure TfrmYarnInfoInPut.initCFGrid();
+begin
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select A.*  from BS_Yarn_Info_CF A ');
+    sql.Add(' where BYIID = ' + quotedStr(Trim(FBYIID)));
+    sql.Add('Order By  A.serialno ');
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_1);
+  SInitCDSData(ADOQueryTemp, CDS_1);
+end;
+
 function TfrmYarnInfoInPut.SaveData(): Boolean;
 var
-  MaxNo, MaxPRID: string;
+  MaxNo, MaxPRID, maxCFID: string;
 begin
   try
     ADOQueryCmd.Connection.BeginTrans;
@@ -213,6 +230,63 @@ begin
     if ADOQueryCmd.RecordCount > 1 then
       raise Exception.Create('Æ·ÃûÖظ´!');
 
+
+
+
+      //////////////////       保存成分表开始          //////////////////////
+    with CDS_1 do
+    begin
+      First;
+      while not Eof do
+      begin
+
+        if Trim(CDS_1.fieldbyname('CFID').AsString) = '' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxCFID, 'CF', 'BS_Yarn_Info_CF', 5, 1) = False then
+          begin
+            ADOQueryCmd.Connection.RollbackTrans;
+            Application.MessageBox('取配比子流水号失败！', '提示', 0);
+            Exit;
+          end;
+        end
+        else
+        begin
+          maxCFID := Trim(CDS_1.fieldbyname('CFID').AsString);
+        end;
+        with ADOQueryCmd do
+        begin
+          Close;
+          SQL.Clear;
+          sql.Add('select * from BS_Yarn_Info_CF where ');
+          sql.Add('  CFID=''' + Trim(maxCFID) + '''');
+          Open;
+        end;
+
+        with ADOQueryCmd do
+        begin
+          if Trim(CDS_1.fieldbyname('BYIID').AsString) = '' then
+          begin
+            Append;
+
+          end
+          else
+          begin
+            Edit;
+
+          end;
+          FieldByName('Y_Code').Value := Y_Code.Text;
+          FieldByName('BYIID').Value := Trim(MaxNo);
+          FieldByName('CFID').Value := Trim(maxCFID);
+          RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'BS_Yarn_Info_CF', 0);
+          Post;
+        end;
+
+        Next;
+      end;
+    end;
+////////////////       保存成分子表结束          //////////////////////
+
+
     ADOQueryCmd.Connection.CommitTrans;
     Result := True;
   except
@@ -223,6 +297,79 @@ begin
 
 end;
 
+procedure TfrmYarnInfoInPut.TbAddClick(Sender: TObject);
+begin
+  try
+    frmYarnCFInfoSel := TfrmYarnCFInfoSel.Create(Application);
+    with frmYarnCFInfoSel do
+    begin
+      if ShowModal = 1 then
+      begin
+        frmYarnCFInfoSel.CDS_1.First;
+        while not frmYarnCFInfoSel.CDS_1.Eof do
+        begin
+          if frmYarnCFInfoSel.CDS_1.FieldByName('SSel').Value = true then
+          begin
+            with Self.CDS_1 do
+            begin
+              Append;
+              FieldByName('DH').Value := frmYarnCFInfoSel.CDS_1.fieldbyname('DH').value;
+              FieldByName('CF').Value := frmYarnCFInfoSel.CDS_1.fieldbyname('CF').value;
+              FieldByName('serialno').Value := Self.CDS_1.RecordCount + 1;
+              Post;
+            end;
+          end;
+
+          frmYarnCFInfoSel.CDS_1.Next;
+        end;
+      end;
+    end;
+  finally
+    frmYarnCFInfoSel.Free;
+  end;
+end;
+
+procedure TfrmYarnInfoInPut.TbDelClick(Sender: TObject);
+var
+  i: Integer;
+begin
+  if not CDS_1.IsEmpty then
+  begin
+    if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) = IDYES then
+    begin
+      if Trim(CDS_1.fieldbyname('CFID').AsString) <> '' then
+      begin
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('delete BS_Yarn_Info_CF where CFID=' + quotedStr(Trim(CDS_1.fieldbyname('CFID').AsString)));
+          ExecSQL;
+        end;
+      end;
+      CDS_1.Delete;
+    end
+    else
+      exit;
+
+    i := 0;
+    CDS_1.First;
+    while not CDS_1.Eof do
+    begin
+      i := i + 1;
+      CDS_1.Edit;
+      CDS_1.fieldByName('serialno').value := i;
+      CDS_1.Post;
+      CDS_1.Next;
+    end;
+  end
+  else
+  begin
+    Application.MessageBox('无可删除数据!', '提示', 0);
+    Exit;
+  end;
+end;
+
 procedure TfrmYarnInfoInPut.TBCloseClick(Sender: TObject);
 begin
 
@@ -274,9 +421,11 @@ begin
   end;
   SCSHData(ADOQueryTemp, ScrollBox1, 2);
 
+  initCFGrid();
+
   if FBYIID = '' then
   begin
-    ByDate.Date := SGetServerDateTime(ADOQueryTemp);
+
   end;
 
 end;
@@ -339,12 +488,6 @@ begin
     Exit;
   end;
 
-  if Trim(YarnFactor.Text) = '' then
-  begin
-    Application.MessageBox('É´ÏßϵÊý²»ÄÜΪ¿Õ!', 'Ìáʾ', 0);
-    Exit;
-  end;
-
   if Trim(Denier.Text) <> '' then
   begin
     if StrToFloatdef(Denier.Text, 0) = 0 then
@@ -361,6 +504,30 @@ begin
   end;
 end;
 
+procedure TfrmYarnInfoInPut.TextEdit(Sender: TObject);
+var
+  s: string;
+  fValue: Double;
+begin
+  s := TcxTextEdit(Sender).EditingText;
+
+  if (s <> '') and (s[Length(s)] <> '%') then
+  begin
+    try
+      // 尝试将字符串转换为浮点数
+      fValue := StrToFloat(s);
+      // 格式化为两位小数并添加百分号
+      Tv1.Controller.FocusedColumn.EditValue := FormatFloat('0.00', fValue) + '%';
+    except
+      on E: EConvertError do
+      begin
+        // 如果转换失败，保持原样并添加百分号
+        Tv1.Controller.FocusedColumn.EditValue := s + '%';
+      end;
+    end;
+  end;
+end;
+
 procedure TfrmYarnInfoInPut.Y_NameClick(Sender: TObject);
 begin
   Y_Composition.Style.Color := clMoneyGreen;

B02基础纱线仓库/U_YarnInfoList.dfm

@@ -291,32 +291,6 @@ inherited frmYarnInfoList: TfrmYarnInfoList
         Options.Editing = False
         Width = 85
       end
-      object Tv1Column3: TcxGridDBColumn
-        Caption = #31867#22411
-        DataBinding.FieldName = 'Y_Type'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 84
-      end
-      object Tv1Column2: TcxGridDBColumn
-        Caption = #21697#29260
-        DataBinding.FieldName = 'Brand'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 79
-      end
-      object v1Column8: TcxGridDBColumn
-        Tag = 2
-        Caption = #35268#26684
-        DataBinding.FieldName = 'Y_Spec'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        HeaderGlyphAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 65
-      end
       object v1Column10: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
@@ -386,14 +360,6 @@ inherited frmYarnInfoList: TfrmYarnInfoList
         Options.Editing = False
         Width = 80
       end
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #25467#24230
-        DataBinding.FieldName = 'ND'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 80
-      end
       object Tv1Column6: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'Y_Color'
@@ -402,30 +368,6 @@ inherited frmYarnInfoList: TfrmYarnInfoList
         Options.Editing = False
         Width = 80
       end
-      object Tv1Column8: TcxGridDBColumn
-        Caption = #26631#26679#26085#26399
-        DataBinding.FieldName = 'BYDate'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 100
-      end
-      object Tv1Column9: TcxGridDBColumn
-        Caption = #21378#23478
-        DataBinding.FieldName = 'CJ'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 100
-      end
-      object Tv1Column10: TcxGridDBColumn
-        Caption = #29702#35770#25439#32791
-        DataBinding.FieldName = 'LLSH'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 100
-      end
       object v1Column12: TcxGridDBColumn
         Tag = 2
         Caption = #22791#27880

B02基础纱线仓库/U_YarnInfoList.pas

@@ -39,7 +39,6 @@ type
     cxGrid1: TcxGrid;
     Tv1: TcxGridDBTableView;
     v2Column1: TcxGridDBColumn;
-    v1Column8: TcxGridDBColumn;
     v1Column3: TcxGridDBColumn;
     v1Column12: TcxGridDBColumn;
     cxGrid1Level1: TcxGridLevel;
@@ -48,7 +47,6 @@ type
     v1Column17: TcxGridDBColumn;
     v1Column18: TcxGridDBColumn;
     v1Column9: TcxGridDBColumn;
-    Tv1Column2: TcxGridDBColumn;
     Label2: TLabel;
     Label4: TLabel;
     Label5: TLabel;
@@ -57,20 +55,15 @@ type
     ToolButton1: TToolButton;
     Tv1Column1: TcxGridDBColumn;
     ToolButton2: TToolButton;
-    Tv1Column3: TcxGridDBColumn;
     lbl1: TLabel;
     Y_Type: TcxComboBox;
     Tv1Column4: TcxGridDBColumn;
-    Tv1Column5: TcxGridDBColumn;
     Tv1Column6: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
     ToolButton3: TToolButton;
     ToolButton4: TToolButton;
     ToolButton5: TToolButton;
     Y_Spec: TcxComboBox;
-    Tv1Column8: TcxGridDBColumn;
-    Tv1Column9: TcxGridDBColumn;
-    Tv1Column10: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -325,7 +318,7 @@ begin
     with frmYarnInfoInPut do
     begin
       FBYIID := '';
-      YarnFactor.Text := '0.059';
+
       FSTKName := self.FSTKName;
       if ShowModal = 1 then
       begin

E00梭织通用窗体/U_TatYarnSel.dfm

@@ -3,14 +3,14 @@ inherited frmTatYarnSel: TfrmTatYarnSel
   Top = 106
   Caption = #32455#36896#21333#32433#32447#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 frmTatYarnSel: TfrmTatYarnSel
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1637
+    Width = 1540
     Height = 38
     AutoSize = True
     ButtonHeight = 38
@@ -64,7 +64,7 @@ inherited frmTatYarnSel: TfrmTatYarnSel
   object Panel1: TPanel [1]
     Left = 0
     Top = 38
-    Width = 1637
+    Width = 1540
     Height = 59
     Align = alTop
     BevelInner = bvRaised
@@ -170,11 +170,10 @@ inherited frmTatYarnSel: TfrmTatYarnSel
   object cxGrid1: TcxGrid [2]
     Left = 0
     Top = 97
-    Width = 1637
+    Width = 1540
     Height = 546
     Align = alClient
     TabOrder = 2
-    ExplicitLeft = 8
     object Tv1: TcxGridDBTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>

E00梭织通用窗体/U_TatYarnSel.pas

@@ -9,25 +9,9 @@ uses
   cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
   cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
-  cxLookAndFeelPainters,   cxNavigator,
+  cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
-  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxCheckBox,
+  System.ImageList, U_BaseInput, cxCheckBox, cxCalendar, dxScrollbarAnnotations,
-  cxCalendar,    
+  dxSkinsCore, dxSkinsDefaultPainters;
-     
-    
-     
-     
-    
-    
-    
-    
-    
-    
-     
-      
-     
-   
-     
-   dxScrollbarAnnotations;
 
 type
   TfrmTatYarnSel = class(TfrmBaseHelp)

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

@@ -1,82 +1,82 @@
 <?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.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.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.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.dfm</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.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.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.873,=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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.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.414,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.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.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.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.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.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.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.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.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.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.555,=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.709,=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.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.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.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.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.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.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.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.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.613,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.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.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.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.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.248,=D:\Dp10RepoV1\项目代码\花蝴蝶\T00贸易通用窗体\U_TradeSalesContractSel.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.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.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.613,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.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.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.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.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.dfm</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.467,=D:\Dp10Repo\项目代码\RTBasics\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.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.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.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.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:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.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.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.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.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.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.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.dfm</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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.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.259,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.125,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.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.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.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.467,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.561,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.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.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_GKInput.dfm</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.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.295,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_WBSpecInPut.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_WBSpecInPut.dfm</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.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.258,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A02基础产品管理\U_GKManageSel.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.259,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A00通用窗体\U_PictureUpload.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>2025/10/13 10:49:44.000.724,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\U_YarnStkSel.pas</Transaction>
   </Transactions>

E01梭织生产计划/U_TatPlanInPut.dfm

@@ -9,7 +9,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
   Font.Height = -13
   Position = poScreenCenter
   WindowState = wsMaximized
-  ExplicitLeft = -674
+  ExplicitLeft = -689
   ExplicitWidth = 1556
   ExplicitHeight = 884
   PixelsPerInch = 96
@@ -73,7 +73,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     Ctl3D = False
     ParentCtl3D = False
     TabOrder = 1
-    ExplicitTop = 24
     object Label2: TLabel
       Left = 922
       Top = 5
@@ -955,7 +954,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
       Top = 263
       ParentColor = True
       TabOrder = 42
-      Text = 'WB_YarnKCQty'
       Width = 95
     end
     object BCRFQty: TcxTextEdit
@@ -983,6 +981,9 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object cxTabSheet1: TcxTabSheet
       Caption = #32463#19997#32452#21512
       ImageIndex = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object GroupBox1: TGroupBox
         Left = 931
         Top = 0
@@ -1436,6 +1437,9 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object cxTabSheet3: TcxTabSheet
       Caption = #36215#32508#27861
       ImageIndex = 3
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Panel5: TPanel
         Left = 0
         Top = 0
@@ -1493,6 +1497,9 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object cxTabSheet4: TcxTabSheet
       Caption = #31359#32508#27861
       ImageIndex = 3
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Panel4: TPanel
         Left = 0
         Top = 0
@@ -1550,6 +1557,9 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object cxTabSheet5: TcxTabSheet
       Caption = #31359#31576#27861
       ImageIndex = 3
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object CKF: TMemo
         Tag = 2
         Left = 0

E02梭织经轴仓库/U_LogInput.dfm

@@ -0,0 +1,272 @@
+inherited frmLogInput: TfrmLogInput
+  Left = 206
+  Top = 106
+  BorderIcons = []
+  Caption = #26797#32455#20135#21697#26085#24535
+  ClientHeight = 536
+  ClientWidth = 1074
+  Color = clWhite
+  Font.Charset = ANSI_CHARSET
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
+  Position = poMainFormCenter
+  ExplicitWidth = 1090
+  ExplicitHeight = 575
+  PixelsPerInch = 96
+  TextHeight = 21
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1074
+    Height = 30
+    AutoSize = True
+    ButtonHeight = 30
+    ButtonWidth = 83
+    Caption = 'ToolBar1'
+    Images = DataLink_WarpBeamStk.cxImageList_bar
+    List = True
+    ShowCaptions = True
+    TabOrder = 0
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object TBFind: TToolButton
+      Left = 63
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      Visible = False
+    end
+    object TbAdd: TToolButton
+      Left = 126
+      Top = 0
+      AutoSize = True
+      Caption = #22686#34892
+      ImageIndex = 2
+      OnClick = TbAddClick
+    end
+    object TbDel: TToolButton
+      Left = 189
+      Top = 0
+      AutoSize = True
+      Caption = #21024#34892
+      ImageIndex = 6
+      OnClick = TbDelClick
+    end
+    object TbSave: TToolButton
+      Left = 252
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384
+      ImageIndex = 37
+      OnClick = TbSaveClick
+    end
+    object TbSaveFormat: TToolButton
+      Left = 315
+      Top = 0
+      AutoSize = True
+      Caption = #20445#23384#26684#24335
+      ImageIndex = 16
+      OnClick = TbSaveFormatClick
+    end
+    object TBClose: TToolButton
+      Left = 402
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object Panel1: TPanel [1]
+    Left = 0
+    Top = 30
+    Width = 1074
+    Height = 43
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clWhite
+    ParentBackground = False
+    TabOrder = 1
+    ExplicitTop = 27
+    object Label4: TLabel
+      Left = 17
+      Top = 10
+      Width = 64
+      Height = 21
+      Caption = #20135#21697#32534#21495
+    end
+    object Acction: TEdit
+      Tag = 2
+      Left = 87
+      Top = 6
+      Width = 150
+      Height = 29
+      TabOrder = 0
+      OnChange = AcctionChange
+    end
+  end
+  object cxGrid2: TcxGrid [2]
+    Left = 0
+    Top = 73
+    Width = 1074
+    Height = 463
+    Align = alClient
+    PopupMenu = PopupMenu1
+    TabOrder = 2
+    ExplicitTop = 71
+    object Tv1: TcxGridDBTableView
+      OnDblClick = Tv1DblClick
+      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DS_1
+      DataController.Summary.DefaultGroupSummaryItems = <
+        item
+          Kind = skSum
+          Position = spFooter
+        end
+        item
+          Kind = skSum
+          Position = spFooter
+        end
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skCount
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        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 Tv1C_Code: TcxGridDBColumn
+        Caption = #25972#32463#24037#33402#32534#21495
+        DataBinding.FieldName = 'Acction'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 137
+      end
+      object Tv1Column1: TcxGridDBColumn
+        Caption = #20462#25913#26085#26399
+        DataBinding.FieldName = 'OperTime'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 173
+      end
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #20462#25913#20154
+        DataBinding.FieldName = 'Operor'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = False
+        Properties.OnButtonClick = Tv1Column2PropertiesButtonClick
+        HeaderAlignmentHorz = taCenter
+        Width = 161
+      end
+      object Tv1Column3: TcxGridDBColumn
+        Caption = #20462#25913#39033#30446
+        DataBinding.FieldName = 'OPEvent'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 409
+      end
+    end
+    object cxGrid2Level1: TcxGridLevel
+      GridView = Tv1
+    end
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    Left = 89
+    Top = 264
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    Left = 105
+    Top = 201
+  end
+  inherited ImageList_new32: TImageList
+    Left = 200
+    Top = 152
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    Parameters = <>
+    Left = 648
+    Top = 216
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 616
+    Top = 144
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_WarpBeamStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 720
+    Top = 264
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 496
+    Top = 176
+  end
+  object cxGridPopupMenu1: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 1088
+    Top = 152
+  end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 528
+    Top = 272
+  end
+  object PopupMenu1: TPopupMenu
+    Left = 264
+    Top = 224
+    object N1: TMenuItem
+      Caption = #20840#36873
+      OnClick = N1Click
+    end
+    object N2: TMenuItem
+      Caption = #20840#24323
+      OnClick = N2Click
+    end
+  end
+end

E02梭织经轴仓库/U_LogInput.pas

@@ -0,0 +1,302 @@
+unit U_LogInput;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView,
+  cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses,
+  cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls,
+  ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
+  cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
+  RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
+  dxDateRanges, U_BaseHelp, U_BaseList, System.ImageList, Vcl.ImgList,
+  dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters;
+
+type
+  TfrmLogInput = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBFind: TToolButton;
+    TbDel: TToolButton;
+    TBClose: TToolButton;
+    Panel1: TPanel;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    DS_1: TDataSource;
+    cxGridPopupMenu1: TcxGridPopupMenu;
+    CDS_1: TClientDataSet;
+    PopupMenu1: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    cxGrid2: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    cxGrid2Level1: TcxGridLevel;
+    Label4: TLabel;
+    Acction: TEdit;
+    TbSaveFormat: TToolButton;
+    TbAdd: TToolButton;
+    TbSave: TToolButton;
+    Tv1Column1: TcxGridDBColumn;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1C_Code: TcxGridDBColumn;
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormCreate(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure ConNoMChange(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TbDelClick(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+    procedure N2Click(Sender: TObject);
+    procedure TbSaveFormatClick(Sender: TObject);
+    procedure AcctionChange(Sender: TObject);
+    procedure TbAddClick(Sender: TObject);
+    procedure Tv1DblClick(Sender: TObject);
+    procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure TbSaveClick(Sender: TObject);
+  private
+    canshu1, FSTKName, canshu3: string;
+    procedure InitGrid();
+    { Private declarations }
+  public
+    fWB_Code: string;
+    { Public declarations }
+  end;
+
+var
+  frmLogInput: TfrmLogInput;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp;
+
+{$R *.dfm}
+
+procedure TfrmLogInput.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmLogInput.FormCreate(Sender: TObject);
+begin
+  inherited;
+  canshu1 := Trim(DParameters1);
+  FSTKName := Trim(DParameters2);
+  canshu3 := Trim(DParameters3);
+end;
+
+procedure TfrmLogInput.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Filtered := False;
+      Close;
+      sql.Clear;
+      sql.Add(' select * from sy_sysLog ');
+      sql.Add(' where Model = ' + QuotedStr(Trim('整经工艺信息修改')));
+      if fWB_Code <> '' then
+      begin
+        SQL.Add(' and 1=2')
+      end;
+      Open;
+    end;
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmLogInput.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmLogInput.TbSaveClick(Sender: TObject);
+var
+  mOPEvent: string;
+begin
+  if CDS_1.IsEmpty then
+  begin
+    Application.MessageBox('请输入修改项目！', '提示信息', MB_OK);
+    Exit;
+  end;
+
+//  if CDS_1.Locate('Operor', '', []) or CDS_1.Locate('Operor', null, []) then
+//  begin
+//    Application.MessageBox('修改人不能为空！', '提示信息', MB_OK);
+//    Exit;
+//  end;
+
+  with CDS_1 do
+  begin
+    First;
+    while not Eof do
+    begin
+      if (CDS_1.FieldByName('Operor').AsString = '') or (CDS_1.FieldByName('Operor').IsNull) then
+      begin
+        Application.MessageBox('修改人不能为空！', '提示信息', MB_OK);
+        Exit;
+      end;
+      if (CDS_1.FieldByName('OPEvent').AsString = '') or (CDS_1.FieldByName('OPEvent').IsNull) then
+      begin
+        Application.MessageBox('修改项目不能为空！', '提示信息', MB_OK);
+        Exit;
+      end;
+      Next;
+    end;
+  end;
+
+  with CDS_1 do
+  begin
+    First;
+    while not Eof do
+    begin
+      with ADOQueryCmd do
+      begin
+        Close;
+        SQL.Clear;
+        sql.Add('select * from SY_sysLog where 1 = 2 ');
+        Open;
+      end;
+      with ADOQueryCmd do
+      begin
+        if ADOQueryCmd.IsEmpty then
+          Append
+        else
+          Edit;
+        RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'SY_sysLog', 0);
+        FieldByName('Model').Value := '整经工艺信息修改';
+        FieldByName('Result').Value := '成功';
+        Post;
+      end;
+      Next;
+    end;
+    Application.MessageBox('保存成功！', '提示信息', MB_OK);
+  end;
+  close;
+end;
+
+procedure TfrmLogInput.TbSaveFormatClick(Sender: TObject);
+begin
+  WriteCxGrid(Self.Caption, Tv1, '整经工艺日志');
+end;
+
+procedure TfrmLogInput.TbAddClick(Sender: TObject);
+begin
+  with CDS_1 do
+  begin
+    Append;
+    CDS_1.FieldByName('Acction').Value := fWB_Code;
+    CDS_1.FieldByName('OperTime').value := SGetServerDatetime(ADOQueryTemp);
+    Post;
+  end;
+end;
+
+procedure TfrmLogInput.Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+var
+  fsj: string;
+  FWZ: Integer;
+begin
+  fsj := Trim(TcxButtonEdit(Sender).Hint);
+  FWZ := Pos('/', fsj);
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      MainType := 'loginput';
+      flag := 'Operor';
+      flagname := '修改人';
+      if ShowModal = 1 then
+      begin
+        CDS_1.Edit;
+        CDS_1.FieldByName(flag).Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+        CDS_1.Post;
+      end;
+    end;
+  finally
+    frmZDYHelp.Free;
+  end;
+end;
+
+procedure TfrmLogInput.Tv1DblClick(Sender: TObject);
+begin
+
+  ModalResult := 1;
+end;
+
+procedure TfrmLogInput.AcctionChange(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 TfrmLogInput.ConNoMChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+  end;
+end;
+
+procedure TfrmLogInput.TBCloseClick(Sender: TObject);
+begin
+  Close;
+end;
+
+procedure TfrmLogInput.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid(Self.Caption, Tv1, '整经工艺日志');
+  InitGrid();
+  if fWB_Code = '' then
+  begin
+    TbAdd.Visible := false;
+    TbDel.Visible := False;
+    TbSave.Visible := false;
+  end
+  else
+  begin
+    TBRafresh.Visible := False;
+    TBFind.Visible := False;
+    Panel1.Visible := False;
+    TBClose.Visible := False;
+  end;
+end;
+
+procedure TfrmLogInput.TbDelClick(Sender: TObject);
+begin
+  if ADOQueryMain.IsEmpty then
+    exit;
+  with CDS_1 do
+  begin
+    Delete;
+  end;
+end;
+
+procedure TfrmLogInput.N1Click(Sender: TObject);
+begin
+  SelOKNo(CDS_1, True);
+end;
+
+procedure TfrmLogInput.N2Click(Sender: TObject);
+begin
+  SelOKNo(CDS_1, False);
+end;
+
+end.
+

E02梭织经轴仓库/U_WBSpecInPut.pas

@@ -157,7 +157,7 @@ implementation
 
 uses
   U_DataLink, U_RTFun, U_ZDYHelp, U_YarnInfoSel, U_TatClothInfoSel, U_TatGYSel,
-  U_CompanySel, U_GKManageSel;
+  U_CompanySel, U_GKManageSel, U_LogInput;
 
 {$R *.dfm}
 
@@ -449,6 +449,28 @@ begin
   try
     ADOQueryCmd.Connection.BeginTrans;
 
+
+    try
+      if FWBSID <> '' then
+      begin
+
+        frmLogInput := TfrmLogInput.Create(Application);
+        with frmLogInput do
+        begin
+          fWB_Code := Self.WB_Code.Text;
+          if ShowModal = 1 then
+          begin
+
+          end;
+        end;
+
+      end;
+    finally
+      frmLogInput.Free;
+    end;
+
+
+
     if Trim(FWBSID) = '' then
     begin
       if GetLSNo(ADOQueryCmd, MaxNo, 'QJ', 'Tat_WB_Spec', 5, 0) = False then

E02梭织经轴仓库/U_WBSpecList.dfm

@@ -17,7 +17,7 @@ inherited frmWBSpecList: TfrmWBSpecList
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 99
+    ButtonWidth = 106
     Caption = 'ToolBar1'
     DisabledImages = DataLink_WarpBeamStk.cxImageList_bar
     Images = DataLink_WarpBeamStk.cxImageList_bar
@@ -33,7 +33,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBRafreshClick
     end
     object TBFind: TToolButton
-      Left = 71
+      Left = 63
       Top = 0
       AutoSize = True
       Caption = #36807#28388
@@ -42,7 +42,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBFindClick
     end
     object TBAdd: TToolButton
-      Left = 142
+      Left = 126
       Top = 0
       AutoSize = True
       Caption = #26032#22686
@@ -50,7 +50,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBAddClick
     end
     object TBEdit: TToolButton
-      Left = 213
+      Left = 189
       Top = 0
       AutoSize = True
       Caption = #20462#25913
@@ -58,7 +58,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBEditClick
     end
     object TBDel: TToolButton
-      Left = 284
+      Left = 252
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -66,7 +66,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBDelClick
     end
     object ToolButton2: TToolButton
-      Left = 355
+      Left = 315
       Top = 0
       AutoSize = True
       Caption = #25171#21360
@@ -74,7 +74,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = ToolButton2Click
     end
     object TBExport: TToolButton
-      Left = 426
+      Left = 378
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -82,7 +82,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBExportClick
     end
     object ToolButton1: TToolButton
-      Left = 497
+      Left = 441
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -90,13 +90,20 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 600
+      Left = 528
       Top = 0
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 7
       OnClick = TBCloseClick
     end
+    object ToolButton3: TToolButton
+      Left = 591
+      Top = 0
+      Caption = 'ToolButton3'
+      ImageIndex = 8
+      OnClick = ToolButton3Click
+    end
   end
   object Panel1: TPanel [1]
     Left = 0

E02梭织经轴仓库/U_WBSpecList.pas

@@ -76,6 +76,7 @@ type
     ToolButton2: TToolButton;
     TV2Column5: TcxGridDBColumn;
     Tv1Column13: TcxGridDBColumn;
+    ToolButton3: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -94,6 +95,7 @@ type
     procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
     procedure WB_CodePropertiesChange(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
   private
     canshu1, FSTKName, canshu3: string;
     procedure InitGrid();
@@ -106,7 +108,7 @@ type
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_WBSpecInPut, U_ZDYHelp, U_LabelPrint;
+  U_DataLink, U_RTFun, U_WBSpecInPut, U_ZDYHelp, U_LabelPrint, U_LogInput;
 
 {$R *.dfm}
 
@@ -176,6 +178,20 @@ begin
   end;
 end;
 
+procedure TfrmWBSpecList.ToolButton3Click(Sender: TObject);
+begin
+  frmLogInput := TfrmLogInput.Create(Application);
+  with frmLogInput do
+  begin
+    fWB_Code := '';
+    if ShowModal = 1 then
+    begin
+
+    end;
+  end;
+
+end;
+
 procedure TfrmWBSpecList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
 begin
   WB_YarnArrNote.Text := Trim(CDS_Main.fieldbyname('WB_YarnArrNote').AsString);
@@ -265,7 +281,7 @@ begin
   end;
   if ADOQueryTemp.IsEmpty = False then
   begin
-    Application.MessageBox('已开卡不能修改!', '提示', 0);
+    Application.MessageBox('已开卡不能删除!', '提示', 0);
     Exit;
   end;
   if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then

E02梭织经轴仓库/WarpBeamStk.dpr

@@ -72,7 +72,9 @@ uses
   U_TatWBPlan in 'U_TatWBPlan.pas' {frmTatWBPlan},
   U_WeaveSel in 'U_WeaveSel.pas' {frmWeaveSel},
   U_Tat_WB_InPut in 'U_Tat_WB_InPut.pas' {frmTat_WB_InPut},
-  U_TatYarnSel in '..\E00梭织通用窗体\U_TatYarnSel.pas' {frmTatYarnSel};
+  U_TatYarnSel in '..\E00梭织通用窗体\U_TatYarnSel.pas' {frmTatYarnSel},
+  U_YarnCFInfoSel in '..\B02基础纱线仓库\U_YarnCFInfoSel.pas' {frmYarnCFInfoSel},
+  U_LogInput in 'U_LogInput.pas' {frmLogInput};
 
 {$R *.res}
 

E02梭织经轴仓库/WarpBeamStk.dproj

@@ -306,6 +306,13 @@
         </DCCReference>
         <DCCReference Include="..\E00梭织通用窗体\U_TatYarnSel.pas">
             <Form>frmTatYarnSel</Form>
+        </DCCReference>
+        <DCCReference Include="..\B02基础纱线仓库\U_YarnCFInfoSel.pas">
+            <Form>frmYarnCFInfoSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_LogInput.pas">
+            <Form>frmLogInput</Form>
             <FormType>dfm</FormType>
         </DCCReference>
         <BuildConfiguration Include="Debug">

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

@@ -50,6 +50,8 @@
     <File Path="..\B02基础纱线仓库"/>
     <File Path="..\B02基础纱线仓库\U_YarnInfoInPut.pas"/>
     <File Path="..\B02基础纱线仓库\U_YarnInfoInPut.dfm"/>
+    <File Path="..\B02基础纱线仓库\U_YarnCFInfoSel.pas"/>
+    <File Path="..\B02基础纱线仓库\U_YarnCFInfoSel.dfm"/>
     <File Path="..\E00梭织通用窗体"/>
     <File Path="..\E00梭织通用窗体\U_TatGYSel.pas"/>
     <File Path="..\E00梭织通用窗体\U_TatGYSel.dfm"/>
@@ -133,26 +135,30 @@
     <File Path="U_WeaveSel.dfm"/>
     <File Path="U_Tat_WB_InPut.pas"/>
     <File Path="U_Tat_WB_InPut.dfm"/>
+    <File Path="U_LogInput.pas"/>
+    <File Path="U_LogInput.dfm"/>
   </ProjectSortOrder>
 	<Transactions>
     <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.423,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel2.pas=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.535,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.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\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.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.158,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas</Transaction>
+    <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.108,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_TatWBPlan.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.215,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_Tat_WB_InPut.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.585,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XZ.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.512,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.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.416,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatYarnSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.024,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_WeaveSel.pas</Transaction>
+    <Transaction>2025/11/15 16:39:54.378,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\B02基础纱线仓库\U_YarnCFInfoSel.pas</Transaction>
+    <Transaction>2025/11/15 17:02:40.598,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E02梭织经轴仓库\U_LogInput.pas</Transaction>
   </Transactions>
 </BorlandProject>