1021

A00通用窗体/U_UserSel.dfm

@@ -24,7 +24,7 @@ inherited frmUserSel: TfrmUserSel
     ButtonWidth = 75
     Caption = 'ToolBar1'
     Color = clSkyBlue
-    Images = DataLink_Financial.ImageList_new32
+    Images = DataLink_Company.ImageList_new32
     List = True
     ParentColor = False
     ShowCaptions = True
@@ -170,30 +170,30 @@ inherited frmUserSel: TfrmUserSel
     end
   end
   inherited ADOQueryBaseCmd: TADOQuery
-    Connection = DataLink_Financial.ADOLink
+    Connection = ADOConnection1
     Left = 473
     Top = 184
   end
   inherited ADOQueryBaseTemp: TADOQuery
-    Connection = DataLink_Financial.ADOLink
+    Connection = ADOConnection1
     Left = 465
     Top = 105
   end
   object ADOQueryTemp: TADOQuery
-    Connection = DataLink_Financial.ADOLink
+    Connection = ADOConnection1
     LockType = ltReadOnly
     Parameters = <>
     Left = 68
     Top = 136
   end
   object ADOQueryCmd: TADOQuery
-    Connection = DataLink_Financial.ADOLink
+    Connection = ADOConnection1
     Parameters = <>
     Left = 188
     Top = 224
   end
   object ADOQueryMain: TADOQuery
-    Connection = DataLink_Financial.ADOLink
+    Connection = ADOConnection1
     LockType = ltReadOnly
     Parameters = <>
     Left = 54

A01基础公司管理/Company.dpr

@@ -35,7 +35,8 @@ uses
   U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint},
   U_PictureUpload in '..\A00通用窗体\U_PictureUpload.pas' {frmPictureUpload},
   U_EmpFileUp in 'U_EmpFileUp.pas' {frmEmpFileUp},
-  U_CoBankSel in 'U_CoBankSel.pas' {frmCoBankSel};
+  U_CoBankSel in 'U_CoBankSel.pas' {frmCoBankSel},
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};
 
 {$R *.res}
 

A01基础公司管理/Company.dproj

@@ -220,6 +220,11 @@
             <Form>frmCoBankSel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
+            <Form>BaseDataLink</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

A01基础公司管理/Company.dproj.local

@@ -5,9 +5,9 @@
     <Transaction>1899-12-30 00:00:00.000.212,=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_PictureUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.670,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGDJInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.167,=D:\Dp10Repo\项目代码\D10myBiaoqi\A01基础公司管理\U_BankSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.432,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGDJInput.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm</Transaction>
@@ -33,8 +33,9 @@
     <Transaction>1899-12-30 00:00:00.000.328,=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_YGRZInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.010,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_CustFileUp.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_EmpFileUp.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.433,D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSelX.dfm=D:\Dp10Repo\项目代码\骉骐\A01基础公司管理\U_ZDYHelpSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm</Transaction>
+    <Transaction>2024-10-17 14:14:49.543,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -93,6 +94,8 @@
     <File Path="..\..\..\public10\design\U_cxGridCustomCss.pas"/>
     <File Path="..\..\..\public10\design\U_globalVar.pas"/>
     <File Path="..\..\..\public10\design\U_WindowFormdesign.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.dfm"/>
     <File Path="..\..\..\public10\ThreeFun"/>
     <File Path="..\..\..\public10\ThreeFun\Fun"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>

A01基础公司管理/U_DataLink.dfm

@@ -1,9 +1,10 @@
-object DataLink_Company: TDataLink_Company
+inherited DataLink_Company: TDataLink_Company
-  OldCreateOrder = False
-  OnCreate = DataModuleCreate
   OnDestroy = DataModuleDestroy
   Height = 349
   Width = 482
+  inherited cxImageList_bar: TcxImageList
+    FormatVersion = 1
+  end
   object AdoDataLink: TADOQuery
     Connection = ADOLink
     Parameters = <>
@@ -10426,6 +10427,8 @@ object DataLink_Company: TDataLink_Company
   object ThreeLookAndFeelCol: TcxLookAndFeelController
     Kind = lfStandard
     NativeStyle = False
+    ScrollbarMode = sbmHybrid
+    SkinName = 'WXI'
     Left = 253
     Top = 12
   end

A01基础公司管理/U_DataLink.pas

@@ -5,7 +5,8 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, cxClasses, dxSkinsCore,
-  dxSkinsDefaultPainters, System.ImageList, Vcl.ExtCtrls, SyncObjs, dxSkinWXI;
+  dxSkinsDefaultPainters, System.ImageList, Vcl.ExtCtrls, SyncObjs, dxSkinWXI,
+  U_BaseDataLink, dxCore, cxLocalization, cxImageList, cxGraphics, dxSkinsForm;
 
 type
   TMyThread = class(TThread)
@@ -35,7 +36,7 @@ var
   UserDataFlag: string;
 
 type
-  TDataLink_Company = class(TDataModule)
+  TDataLink_Company = class(TBaseDataLink)
     AdoDataLink: TADOQuery;
     ADOLink: TADOConnection;
     ThreeImgList: TImageList;
@@ -107,11 +108,13 @@ end;
 
 procedure TDataLink_Company.DataModuleCreate(Sender: TObject);
 begin
+  inherited;
   CriticalSection := TCriticalSection.Create;
 end;
 
 procedure TDataLink_Company.DataModuleDestroy(Sender: TObject);
 begin
+  inherited;
   CriticalSection.Free;
   DataLink_Company := nil;
 end;

A09财务通用管理/Financial.dpr

@@ -34,11 +34,11 @@ uses
   U_handPayableList in 'U_handPayableList.pas' {frmhandPayableList},
   U_HandPayableInPut in 'U_HandPayableInPut.pas' {frmHandPayableInPut},
   U_HandPayableImport in 'U_HandPayableImport.pas' {frmHandPayableImport},
-  U_UserSel in '..\A00通用窗体\U_UserSel.pas' {frmUserSel},
   U_ProductInfoSel in '..\A00通用窗体\U_ProductInfoSel.pas' {frmProductInfoSel},
   U_PictureUpload in '..\A00通用窗体\U_PictureUpload.pas' {frmPictureUpload},
   U_FinFileUp in 'U_FinFileUp.pas' {frmFinFileUp},
-  U_PayableEdit in 'U_PayableEdit.pas' {frmPayableEdit};
+  U_PayableEdit in 'U_PayableEdit.pas' {frmPayableEdit},
+  U_UserSel in 'U_UserSel.pas' {frmUserSel};
 
 {$R *.res}
 

A09财务通用管理/Financial.dproj

@@ -218,10 +218,6 @@
             <Form>frmHandPayableImport</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <DCCReference Include="..\A00通用窗体\U_UserSel.pas">
-            <Form>frmUserSel</Form>
-            <FormType>dfm</FormType>
-        </DCCReference>
         <DCCReference Include="..\A00通用窗体\U_ProductInfoSel.pas">
             <Form>frmProductInfoSel</Form>
             <FormType>dfm</FormType>
@@ -238,6 +234,10 @@
             <Form>frmPayableEdit</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_UserSel.pas">
+            <Form>frmUserSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

A09财务通用管理/Financial.dproj.local

@@ -1,58 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.064,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.728,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.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.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.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_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.646,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_PayableEdit.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.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.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.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.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.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm</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.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.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.823,D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.753,=D:\Dp10Repo\项目代码\骉骐\T00贸易通用窗体\U_TradePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.103,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_BankSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.715,=D:\Dp10Repo\public10\design\U_BaseDataLink.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.095,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableImport.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.552,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.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.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.402,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.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.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.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.072,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_FinFileUp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.672,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_HandPayableInPut.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.040,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.345,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_FtyStatement.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.061,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.551,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_InvoiceInList.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_handPayableList.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.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.927,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_OtherPayableInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.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.318,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.308,D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_UserSel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_UserSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.823,D:\Dp10Repo\项目代码\骉骐\A09财务通用管理\U_CompanySel.pas=D:\Dp10Repo\项目代码\骉骐\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.646,=D:\Dp10Repo\项目代码\D10myBiaoqi\A09财务通用管理\U_PayableEdit.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.076,=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -101,8 +105,6 @@
     <File Path="..\A00通用窗体\U_PictureUpload.dfm"/>
     <File Path="..\A00通用窗体\U_ProductInfoSel.pas"/>
     <File Path="..\A00通用窗体\U_ProductInfoSel.dfm"/>
-    <File Path="..\A00通用窗体\U_UserSel.pas"/>
-    <File Path="..\A00通用窗体\U_UserSel.dfm"/>
     <File Path="..\T00贸易通用窗体"/>
     <File Path="..\T00贸易通用窗体\U_TradePlanSel.pas"/>
     <File Path="..\T00贸易通用窗体\U_TradePlanSel.dfm"/>
@@ -149,5 +151,7 @@
     <File Path="U_FinFileUp.dfm"/>
     <File Path="U_PayableEdit.pas"/>
     <File Path="U_PayableEdit.dfm"/>
+    <File Path="U_UserSel.pas"/>
+    <File Path="U_UserSel.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

A09财务通用管理/U_CollectInput.dfm

@@ -34,7 +34,6 @@ object frmCollectInput: TfrmCollectInput
     ParentColor = False
     ShowCaptions = True
     TabOrder = 0
-    ExplicitWidth = 919
     object ToolButton3: TToolButton
       Left = 0
       Top = 0
@@ -72,9 +71,6 @@ object frmCollectInput: TfrmCollectInput
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
-    ExplicitTop = 44
-    ExplicitWidth = 919
-    ExplicitHeight = 305
     object Label2: TLabel
       Left = 245
       Top = 20

A09财务通用管理/U_CollectInput.pas

@@ -76,7 +76,7 @@ type
     function SaveData(): Boolean;
   public
     { Public declarations }
-    FFFID: string;
+    FFFID,PState: string;
   end;
 
 var
@@ -116,6 +116,14 @@ begin
       FFTime.DateTime := SGetServerDateTime(ADOQueryTemp);
     end;
 
+    if PState='¸´ÖÆ' then
+    begin
+       FFFID:='';
+
+       DKAmount.text:='';
+       Amount.text:='';
+    end;
+
   finally
     ADOQueryMain.EnableControls;
   end;
@@ -285,7 +293,7 @@ begin
 
   if Currency.text = 'USD' then
   begin
-    if MDKAmount / MHL >= 0 then
+    if MDKAmount / MHL <> 0 then
     begin
       MAmount := RoundFloat((MDKAmount / MHL), 2);
     end;
@@ -293,7 +301,7 @@ begin
   else if Currency.text = 'CNY' then
   begin
 
-    if MDKAmount * MHL >= 0 then
+    if MDKAmount * MHL <> 0 then
     begin
       MAmount := RoundFloat((MDKAmount * MHL), 2);
     end;

A09财务通用管理/U_CollectList.dfm

@@ -6,6 +6,7 @@ inherited frmCollectList: TfrmCollectList
   ClientWidth = 1540
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -16
   ExplicitWidth = 1556
   ExplicitHeight = 629
   PixelsPerInch = 96
@@ -51,16 +52,24 @@ inherited frmCollectList: TfrmCollectList
       ImageIndex = 3
       OnClick = btnEditClick
     end
-    object btnDel: TToolButton
+    object ToolButton1: TToolButton
       Left = 213
       Top = 0
       AutoSize = True
+      Caption = #22797#21046
+      ImageIndex = 9
+      OnClick = ToolButton1Click
+    end
+    object btnDel: TToolButton
+      Left = 284
+      Top = 0
+      AutoSize = True
       Caption = #21024#38500
       ImageIndex = 5
       OnClick = btnDelClick
     end
     object btnChk: TToolButton
-      Left = 284
+      Left = 355
       Top = 0
       AutoSize = True
       Caption = #23457#26680
@@ -68,7 +77,7 @@ inherited frmCollectList: TfrmCollectList
       OnClick = btnChkClick
     end
     object btnReChk: TToolButton
-      Left = 355
+      Left = 426
       Top = 0
       AutoSize = True
       Caption = #25764#38144#23457#26680
@@ -76,7 +85,7 @@ inherited frmCollectList: TfrmCollectList
       OnClick = btnReChkClick
     end
     object ToolButton7: TToolButton
-      Left = 450
+      Left = 521
       Top = 0
       AutoSize = True
       Caption = #26680#38144
@@ -84,7 +93,7 @@ inherited frmCollectList: TfrmCollectList
       OnClick = ToolButton7Click
     end
     object ToolButton8: TToolButton
-      Left = 521
+      Left = 592
       Top = 0
       AutoSize = True
       Caption = #26680#38144#26085#24535
@@ -92,7 +101,7 @@ inherited frmCollectList: TfrmCollectList
       OnClick = ToolButton8Click
     end
     object ToolButton9: TToolButton
-      Left = 616
+      Left = 687
       Top = 0
       AutoSize = True
       Caption = #38468#20214#19978#20256
@@ -100,7 +109,7 @@ inherited frmCollectList: TfrmCollectList
       OnClick = ToolButton9Click
     end
     object ToolButton4: TToolButton
-      Left = 711
+      Left = 782
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -108,7 +117,7 @@ inherited frmCollectList: TfrmCollectList
       OnClick = ToolButton4Click
     end
     object ToolButton5: TToolButton
-      Left = 782
+      Left = 853
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -116,7 +125,7 @@ inherited frmCollectList: TfrmCollectList
       OnClick = ToolButton5Click
     end
     object TBClose: TToolButton
-      Left = 877
+      Left = 948
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -274,6 +283,7 @@ inherited frmCollectList: TfrmCollectList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 142
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -460,6 +470,13 @@ inherited frmCollectList: TfrmCollectList
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
+      object Tv1Column9: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 84
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = Tv1

A09财务通用管理/U_CollectList.pas

@@ -82,6 +82,8 @@ type
     Tv1Column6: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
     Tv1Column8: TcxGridDBColumn;
+    Tv1Column9: TcxGridDBColumn;
+    ToolButton1: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure btnDelClick(Sender: TObject);
@@ -102,6 +104,7 @@ type
     procedure ToolButton8Click(Sender: TObject);
     procedure ToolButton9Click(Sender: TObject);
     procedure N3Click(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
   private
     procedure InitGrid();
     procedure SetStatus();
@@ -477,6 +480,25 @@ begin
   end;
 end;
 
+procedure TfrmCollectList.ToolButton1Click(Sender: TObject);
+begin
+  try
+    frmCollectInput := TfrmCollectInput.Create(Application);
+    with frmCollectInput do
+    begin
+      FFFID := Trim(SELF.CDS_1.fieldbyname('FFID').AsString);
+      PState:='¸´ÖÆ';
+      if ShowModal = 1 then
+      begin
+        InitGrid();
+      end;
+    end;
+  finally
+    frmCollectInput.Free;
+  end;
+
+end;
+
 procedure TfrmCollectList.ToolButton4Click(Sender: TObject);
 begin
   if ADOQueryMain.IsEmpty then

A09财务通用管理/U_CustStatement.dfm

@@ -270,7 +270,21 @@ inherited frmCustStatement: TfrmCustStatement
         Properties.Alignment.Horz = taCenter
         HeaderAlignmentHorz = taCenter
         Options.Focusing = False
-        Width = 281
+        Width = 271
+      end
+      object Tv2Column3: TcxGridDBColumn
+        Caption = #25105#26041#21333#20301
+        DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 93
+      end
+      object Tv2Column4: TcxGridDBColumn
+        Caption = #19994#21153#21592
+        DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 61
       end
       object v2Column5: TcxGridDBColumn
         Caption = #19978#26399#27424#27454

A09财务通用管理/U_CustStatement.pas

@@ -57,6 +57,8 @@ type
     N1: TMenuItem;
     Tv2Column1: TcxGridDBColumn;
     Tv2Column2: TcxGridDBColumn;
+    Tv2Column3: TcxGridDBColumn;
+    Tv2Column4: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);

A09财务通用管理/U_ReceivableInput.dfm

@@ -72,7 +72,6 @@ object frmReceivableInput: TfrmReceivableInput
     ParentFont = False
     TabOrder = 1
     OnClick = ScrollBox1Click
-    ExplicitTop = 44
     object Label2: TLabel
       Left = 245
       Top = 20

A09财务通用管理/U_ReceivableInput.pas

@@ -124,7 +124,7 @@ begin
   MAmount := Strtofloatdef(Amount.Text, 0);
   MYJ := Strtofloatdef(YJ.Text, 0);
 
-  if MQty * MPrice >= 0 then
+  if MQty * MPrice <> 0 then
   begin
     MAmount := RoundFloat((MQty * MPrice * ((100-MYJ)/100) + MOtherFee - MDeduction), 2);
   end;

A09财务通用管理/U_ReceivableList.dfm

@@ -6,6 +6,8 @@ inherited frmReceivableList: TfrmReceivableList
   ClientWidth = 1540
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -398
+  ExplicitTop = -20
   ExplicitWidth = 1556
   ExplicitHeight = 629
   PixelsPerInch = 96
@@ -274,6 +276,7 @@ inherited frmReceivableList: TfrmReceivableList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 142
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -307,6 +310,10 @@ inherited frmReceivableList: TfrmReceivableList
         item
           Kind = skSum
           Column = Tv1Column25
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column30
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsBehavior.GoToNextCellOnEnter = True

A09财务通用管理/U_ReceivableList.pas

@@ -177,7 +177,7 @@ begin
       Close;
       SQL.Clear;
       Filtered := False;
-      sql.Add(' select A.*,Saleser=(select Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)  ');
+      sql.Add(' select CONVERT(varchar,A.SailingSchedule,23) SailingSchedule,A.*,Saleser=(select Saleser from BS_Company X where X.CoAbbrName=A.OppCoName)  ');
       sql.Add(' from Finance_Flow A where A.FFType=''壇澗운되션''  ');
       case cxTabControl1.TabIndex of
         0:

A09财务通用管理/U_UserSel.dfm

@@ -0,0 +1,224 @@
+inherited frmUserSel: TfrmUserSel
+  Left = 770
+  Top = 211
+  Caption = #29992#25143#36873#25321
+  ClientHeight = 522
+  ClientWidth = 604
+  Color = clWhite
+  Font.Charset = GB2312_CHARSET
+  Font.Height = -12
+  Font.Name = #23435#20307
+  OnClose = FormClose
+  ExplicitWidth = 620
+  ExplicitHeight = 561
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 604
+    Height = 38
+    AutoSize = True
+    ButtonHeight = 38
+    ButtonWidth = 75
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Images = DataLink_Financial.ImageList_new32
+    List = True
+    ParentColor = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object ToolButton2: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      OnClick = ToolButton2Click
+    end
+    object btnOK: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
+      Caption = #30830#35748
+      ImageIndex = 12
+      OnClick = btnOKClick
+    end
+    object TBClose: TToolButton
+      Left = 213
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object Panel1: TPanel [1]
+    Left = 0
+    Top = 38
+    Width = 604
+    Height = 39
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clSkyBlue
+    TabOrder = 1
+    ExplicitTop = 18
+    object Label3: TLabel
+      Left = 202
+      Top = 13
+      Width = 24
+      Height = 12
+      Caption = #21517#31216
+    end
+    object Label1: TLabel
+      Left = 22
+      Top = 13
+      Width = 24
+      Height = 12
+      Caption = #32534#21495
+    end
+    object UserName: TEdit
+      Tag = 2
+      Left = 232
+      Top = 9
+      Width = 89
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 1
+      OnChange = UserNameChange
+    end
+    object UserID: TEdit
+      Tag = 2
+      Left = 52
+      Top = 9
+      Width = 89
+      Height = 20
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      TabOrder = 0
+      OnChange = UserNameChange
+    end
+  end
+  object cxGrid1: TcxGrid [2]
+    Left = 0
+    Top = 77
+    Width = 604
+    Height = 445
+    Align = alClient
+    TabOrder = 2
+    ExplicitTop = 57
+    ExplicitHeight = 465
+    object Tv1: TcxGridDBTableView
+      OnDblClick = Tv1DblClick
+      Navigator.Buttons.CustomButtons = <>
+      Navigator.Buttons.Delete.Enabled = False
+      Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DS_1
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <>
+      DataController.Summary.SummaryGroups = <>
+      OptionsBehavior.GoToNextCellOnEnter = True
+      OptionsCustomize.ColumnFiltering = False
+      OptionsView.GroupByBox = False
+      object VC_SSel: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        HeaderAlignmentHorz = taCenter
+        Width = 48
+      end
+      object v2Column1: TcxGridDBColumn
+        Caption = #32534#21495
+        DataBinding.FieldName = 'UserID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 76
+      end
+      object v2Column2: TcxGridDBColumn
+        Caption = #21517#31216
+        DataBinding.FieldName = 'UserName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 171
+      end
+      object v2Column3: TcxGridDBColumn
+        Caption = #37096#38376
+        DataBinding.FieldName = 'Udept'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 71
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = Tv1
+    end
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    Left = 473
+    Top = 184
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    Left = 465
+    Top = 105
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 68
+    Top = 136
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    Parameters = <>
+    Left = 188
+    Top = 224
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_Financial.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 54
+    Top = 224
+  end
+  object cxGridPopupMenu2: TcxGridPopupMenu
+    Grid = cxGrid1
+    PopupMenus = <>
+    Left = 211
+    Top = 124
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 262
+    Top = 320
+  end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 158
+    Top = 304
+  end
+  object ADOConnection1: TADOConnection
+    LoginPrompt = False
+    Left = 336
+    Top = 176
+  end
+end

A09财务通用管理/U_UserSel.pas

@@ -0,0 +1,190 @@
+unit U_UserSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
+  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
+  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
+  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
+  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
+  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
+  cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
+  dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, U_BaseHelp,
+  dxBarBuiltInMenu, System.ImageList, Vcl.ImgList, dxSkinWXI,
+  dxScrollbarAnnotations;
+
+type
+  FdDy = record
+    inc: integer; //客户端套接字句柄
+    FDdys: string[32]; //客户端套接字
+    FdDysName: string[32]; //客户端套接字
+  end;
+
+  TfrmUserSel = class(TfrmBaseHelp)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBClose: TToolButton;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    Panel1: TPanel;
+    ToolButton2: TToolButton;
+    ADOQueryMain: TADOQuery;
+    Label3: TLabel;
+    UserName: TEdit;
+    cxGrid1: TcxGrid;
+    Tv1: TcxGridDBTableView;
+    cxGridLevel1: TcxGridLevel;
+    cxGridPopupMenu2: TcxGridPopupMenu;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    Label1: TLabel;
+    UserID: TEdit;
+    btnOK: TToolButton;
+    v2Column1: TcxGridDBColumn;
+    v2Column2: TcxGridDBColumn;
+    v2Column3: TcxGridDBColumn;
+    VC_SSel: TcxGridDBColumn;
+    ADOConnection1: TADOConnection;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure UserNameChange(Sender: TObject);
+    procedure btnOKClick(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure Tv1DblClick(Sender: TObject);
+  private
+
+    { Private declarations }
+    procedure InitGrid();
+  public
+    Fdept: string;
+    FMultiple: Boolean;
+  end;
+
+var
+  frmUserSel: TfrmUserSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmUserSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Filtered := False;
+      Close;
+      SQL.Clear;
+      sql.Add(' select * from SY_User where 1=1  ');
+
+      if Trim(Fdept) <> '' then
+      begin
+        sql.Add('and Udept=' + QuotedStr(Trim(Fdept)));
+      end;
+      Open;
+    end;
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmUserSel.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 TfrmUserSel.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmUserSel := nil;
+end;
+
+procedure TfrmUserSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmUserSel.TBCloseClick(Sender: TObject);
+begin
+  WriteCxGrid(trim(self.caption), Tv1, '账户选择');
+  Close;
+end;
+
+procedure TfrmUserSel.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid(trim(self.Caption), Tv1, '账户选择');
+  if FMultiple then
+  begin
+    VC_SSel.Visible := True;
+    VC_SSel.Hidden := False;
+  end
+  else
+  begin
+    VC_SSel.Visible := False;
+    VC_SSel.Hidden := True;
+  end;
+  InitGrid();
+end;
+
+procedure TfrmUserSel.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmUserSel.ToolButton2Click(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 TfrmUserSel.Tv1DblClick(Sender: TObject);
+begin
+
+  ModalResult := 1;
+end;
+
+procedure TfrmUserSel.UserNameChange(Sender: TObject);
+begin
+  ToolButton2.Click;
+end;
+
+procedure TfrmUserSel.btnOKClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+end.
+

B01基础合同管理/U_SalesConInPut.dfm

@@ -11,8 +11,6 @@ inherited frmSalesConInPut: TfrmSalesConInPut
   OldCreateOrder = True
   Position = poScreenCenter
   WindowState = wsMaximized
-  ExplicitLeft = -326
-  ExplicitTop = -2
   ExplicitWidth = 1533
   ExplicitHeight = 734
   PixelsPerInch = 96

B01基础合同管理/U_SalesConInPut.pas

@@ -1341,6 +1341,16 @@ begin
       First;
       while not Eof do
       begin
+        with ADOCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('select * from BS_Cloth_Info where C_Code=''' + Trim(Order_Sub.fieldbyname('C_Code').AsString) + '''');
+          Open;
+        end;
+        if ADOCmd.IsEmpty then
+          raise Exception.Create('产品编号不存在，不能保存！');
+
         maxno := Trim(Order_Sub.fieldbyname('ConSId').AsString);
         with ADOCmd do
         begin

T01贸易生产计划/U_TradePlanInPut.dfm

@@ -112,7 +112,6 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     ParentCtl3D = False
     TabOrder = 1
     OnClick = ScrollBox1Click
-    ExplicitTop = 32
     object Label3: TLabel
       Left = 399
       Top = 49

T01贸易生产计划/U_TradePlanInPut.pas

@@ -597,6 +597,8 @@ begin
       First;
       while not Eof do
       begin
+
+
         if Trim(CDS_1.fieldbyname('SubId').AsString) = '' then
         begin
           if GetLSNo(ADOCmd, Smaxno, 'JS', 'Trade_Plan_Sub', 4, 1) = False then
@@ -699,6 +701,16 @@ begin
     if ADOCmd.RecordCount > 1 then
       raise Exception.Create('¶©µ¥ºÅÖظ´!');
 
+    with ADOCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from BS_Cloth_Info where C_Code=''' + Trim(C_Code.Text) + '''');
+      Open;
+    end;
+    if ADOCmd.IsEmpty then
+      raise Exception.Create('产品编号不存在，不能保存！');
+
     FMainId := Trim(maxno);
 
     ADOCmd.Connection.CommitTrans;

T01贸易生产计划/U_TradePlanList.dfm

@@ -411,6 +411,14 @@ inherited frmTradePlanList: TfrmTradePlanList
         item
           Kind = skSum
           Column = Tv1Column10
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column20
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column21
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -604,6 +612,20 @@ inherited frmTradePlanList: TfrmTradePlanList
         DataBinding.FieldName = 'FtyName'
         DataBinding.IsNullValueType = True
       end
+      object Tv1Column20: TcxGridDBColumn
+        Caption = #31859#25968
+        DataBinding.FieldName = 'Length'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 66
+      end
+      object Tv1Column21: TcxGridDBColumn
+        Caption = #37325#37327
+        DataBinding.FieldName = 'Weight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 66
+      end
       object Tv1Column9: TcxGridDBColumn
         Caption = #36319#21333#21592
         DataBinding.FieldName = 'FollowMan'
@@ -643,7 +665,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       '  '#24453#25552#20132'      '
       '  '#24453#23457#26680'  '
       '  '#24050#23457#26680' '
-      '  '#26242#23384'   '
+      '  '#26242#23384#21306'   '
       '  '#29983#20135#23436#25104'   '
       '  '#24050#23436#25104'  '
       '  '#20840#37096'   ')
@@ -856,8 +878,8 @@ inherited frmTradePlanList: TfrmTradePlanList
     end
   end
   object Panel3: TPanel [6]
-    Left = 71
+    Left = -49
-    Top = 195
+    Top = 201
     Width = 1177
     Height = 634
     Color = clBtnHighlight

T01贸易生产计划/U_TradePlanList.pas

@@ -161,6 +161,8 @@ type
     DBFS: TBtnEditC;
     ToolButton7: TToolButton;
     ToolButton8: TToolButton;
+    Tv1Column20: TcxGridDBColumn;
+    Tv1Column21: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -275,7 +277,7 @@ begin
   ToolButton7.Enabled := False;
   ToolButton8.Enabled := False;
 
-  if (canshu1 = '¼Èë') or (canshu1='¹ÜÀí') then
+  if (canshu1 = '¼Èë') or (canshu1 = '¹ÜÀí') then
   begin
     case cxTabControl1.TabIndex of
       0:
@@ -422,28 +424,28 @@ begin
     exit;
   end;
 
-  MMeter := 0;
+  MMeter := tv1.DataController.Summary.FooterSummaryValues[2];
-  MKG := 0;
+  MKG := tv1.DataController.Summary.FooterSummaryValues[3];
-  with Order_Main do
+//  with Order_Main do
-  begin
+//  begin
-    First;
+//    First;
-    while not Eof do
+//    while not Eof do
-    begin
+//    begin
-      if FieldByName('OrdUnit').ASString = 'Kg' then
+//      if FieldByName('OrdUnit').ASString = 'Kg' then
-      begin
+//      begin
-        MKG := MKG + StrToFloat(FieldByName('OrdQty').AsString);
+//        MKG := MKG + StrToFloat(FieldByName('OrdQty').AsString);
-      end
+//      end
-      else if FieldByName('OrdUnit').ASString = 'M' then
+//      else if FieldByName('OrdUnit').ASString = 'M' then
-      begin
+//      begin
-        MMeter := MMeter + StrToFloat(FieldByName('OrdQty').AsString);
+//        MMeter := MMeter + StrToFloat(FieldByName('OrdQty').AsString);
-      end
+//      end
-      else if FieldByName('OrdUnit').ASString = 'Y' then
+//      else if FieldByName('OrdUnit').ASString = 'Y' then
-      begin
+//      begin
-        MMeter := MMeter + RoundFloat(StrToFloat(FieldByName('OrdQty').AsString) * 0.9144, 2);
+//        MMeter := MMeter + RoundFloat(StrToFloat(FieldByName('OrdQty').AsString) * 0.9144, 2);
-      end;
+//      end;
-      Next;
+//      Next;
-    end;
+//    end;
-  end;
+//  end;
 
   Label5.Caption := '×ÜÃ×Êý£º' + FloattoStr(MMeter) + '    ×ÜÖØÁ¿£º' + FloattoStr(MKG)
 end;
@@ -530,9 +532,13 @@ begin
       end;
     3:
       begin
-        STRwhere := STRwhere + ' and  isnull(A.status,''0'')=''11'' ';
+        STRwhere := STRwhere + ' and  isnull(A.status,''0'')=''7'' ';
       end;
     4:
+      begin
+        STRwhere := STRwhere + ' and  isnull(A.status,''0'')=''11'' ';
+      end;
+    5:
       begin
         STRwhere := STRwhere + ' and  isnull(A.status,''0'')=''10'' ';
       end;
@@ -1533,7 +1539,7 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('update  Trade_Plan_Main SET status=''9'' ');
+      sql.Add('update  Trade_Plan_Main SET status=''11'' ');
       sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString)));
       sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
       sql.Add(' ' + quotedstr(trim(DName)));

T02贸易汇总仓库/U_TradeFinishClothInEdit.dfm

@@ -85,7 +85,8 @@ inherited frmTradeFinishClothInEdit: TfrmTradeFinishClothInEdit
           #29983#20135#36864#22238
           #30424#30408#20837#24211
           #38144#21806#36864#22238
-          #26399#21021#20837#24211)
+          #26399#21021#20837#24211
+          #22238#20462#20837#24211)
         HeaderAlignmentHorz = taCenter
         Width = 87
       end

T02贸易汇总仓库/U_TradeFinishClothInEdit.pas

@@ -558,8 +558,15 @@ begin
   try
     frmCompanySel := TfrmCompanySel.Create(Application);
     with frmCompanySel do
+    begin
+      if CDS_Sub.FieldByName('IOType').value = '销售退回' then
+      begin
+        FCoType := '客户';
+      end
+      else
       begin
         FCoType := '¹©Ó¦ÉÌ';
+      end;
       if ShowModal = 1 then
       begin
         with Self.CDS_Sub do

T02贸易汇总仓库/U_TradeFinishClothInList.dfm

@@ -241,7 +241,8 @@ inherited frmTradeFinishClothInList: TfrmTradeFinishClothInList
         #21152#24037#20837#24211
         #29983#20135#36864#22238
         #30424#30408#20837#24211
-        #38144#21806#36864#22238)
+        #38144#21806#36864#22238
+        #22238#20462#20837#24211)
     end
     object BatchNo: TEdit
       Tag = 2

T02贸易汇总仓库/U_TradeFinishClothOutEdit.dfm

@@ -87,6 +87,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
     object Tv1: TcxGridDBTableView
       OnMouseDown = Tv1MouseDown
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource3
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
@@ -121,11 +122,13 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object Tv1Column11: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'FromOrdNo'
+        DataBinding.IsNullValueType = True
         Options.Editing = False
       end
       object v1Column6: TcxGridDBColumn
         Caption = #20986#24211#21333#21495
         DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 91
@@ -133,6 +136,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column2: TcxGridDBColumn
         Caption = #20986#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -142,6 +146,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1CRType: TcxGridDBColumn
         Caption = #20986#24211#31867#22411
         DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.DropDownRows = 20
@@ -152,13 +157,14 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
           #36864#36135#20986#24211
           #35843#25320#20986#24211
           #30424#20111#20986#24211
-          '')
+          #22238#20462#20986#24211)
         HeaderAlignmentHorz = taCenter
         Width = 79
       end
       object v1Column1: TcxGridDBColumn
         Caption = #37319#36141#21152#24037#21512#21516#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -175,6 +181,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object Tv1Column2: TcxGridDBColumn
         Caption = #20986#21040#21333#20301
         DataBinding.FieldName = 'ToCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -189,6 +196,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column13: TcxGridDBColumn
         Caption = #20986#21040#35745#21010#21333
         DataBinding.FieldName = 'ToOrdNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -203,6 +211,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object Tv1Column3: TcxGridDBColumn
         Caption = #23384#25918#21333#20301
         DataBinding.FieldName = 'StkCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -210,6 +219,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column5: TcxGridDBColumn
         Caption = #26469#33258#21333#20301
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 82
@@ -217,6 +227,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v2Column1: TcxGridDBColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'C_name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -230,6 +241,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column8: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
@@ -238,6 +250,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column10: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 67
@@ -245,12 +258,14 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object Tv1Column7: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 57
       end
       object v1Column11: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 73
@@ -258,6 +273,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column7: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 77
@@ -265,6 +281,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1CheJian: TcxGridDBColumn
         Caption = #36710#38388
         DataBinding.FieldName = 'Workshop'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         HeaderAlignmentHorz = taCenter
         Width = 69
@@ -272,6 +289,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column14: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v1Column14PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -280,6 +298,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v2Column6: TcxGridDBColumn
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 85
@@ -287,6 +306,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column3: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -294,17 +314,20 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object v1Column12: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         Width = 79
       end
       object Tv1Column1: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #33394#21035
         DataBinding.FieldName = 'C_ColorDepth'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 76
@@ -312,6 +335,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object Tv1Column5: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 74
@@ -319,12 +343,14 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object Tv1Column6: TcxGridDBColumn
         Caption = #26579#21378#32568#21495
         DataBinding.FieldName = 'FtyPCId'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end
       object Tv1Column8: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -332,6 +358,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object Tv1Column9: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -339,6 +366,7 @@ inherited frmTradeFinishClothOutEdit: TfrmTradeFinishClothOutEdit
       object Tv1Column10: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66

T02贸易汇总仓库/U_TradeFinishClothOutEdit.pas

@@ -11,7 +11,7 @@ uses
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, cxSpinEdit,
   StdCtrls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
   dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
-  U_BaseInput, System.ImageList, Vcl.ImgList;
+  U_BaseInput, System.ImageList, Vcl.ImgList, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmTradeFinishClothOutEdit = class(TfrmBaseInput)

T02贸易汇总仓库/U_TradeFinishClothOutList.dfm

@@ -241,7 +241,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
     end
     object IOType: TComboBox
       Tag = 2
-      Left = 228
+      Left = 233
       Top = 35
       Width = 80
       Height = 20
@@ -256,7 +256,8 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         #38144#21806#20986#24211
         #36864#36135#20986#24211
         #35843#25320#20986#24211
-        #30424#20111#20986#24211)
+        #30424#20111#20986#24211
+        #22238#20462#20986#24211)
     end
     object CheJian: TEdit
       Tag = 2
@@ -296,6 +297,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
     TabOrder = 2
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <
@@ -343,6 +345,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column5: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -351,6 +354,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object v1Column5: TcxGridDBColumn
         Caption = #36710#38388
         DataBinding.FieldName = 'Workshop'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 86
@@ -358,6 +362,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object v1Column6: TcxGridDBColumn
         Caption = #20986#24211#21333#21495
         DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 83
@@ -366,6 +371,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #20986#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.SaveTime = False
         Properties.ShowTime = False
@@ -377,6 +383,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #20986#24211#31867#22411
         DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -391,6 +398,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #25152#23646#31867#22411
         DataBinding.FieldName = 'SSType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -405,6 +413,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object v1Column1: TcxGridDBColumn
         Caption = #37319#36141#21333#21495
         DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -415,6 +424,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #26469#33258#21333#20301
         DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Alignment.Horz = taLeftJustify
         Properties.Buttons = <
@@ -430,6 +440,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object v1Column13: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 71
@@ -437,12 +448,14 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object v1Column16: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object v1Column17: TcxGridDBColumn
         Caption = #21697#29260
         DataBinding.FieldName = 'SXPinPai'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -453,6 +466,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #21697#21517
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -466,6 +480,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object v1Column20: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'SPCode'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -476,6 +491,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Options.Editing = False
@@ -484,6 +500,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object v1Column10: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -493,12 +510,14 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column6: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 73
       end
       object v1Column7: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 68
@@ -506,12 +525,14 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column7: TcxGridDBColumn
         Caption = #26579#21378#32568#21495
         DataBinding.FieldName = 'FtyPCId'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 78
       end
       object v1Column18: TcxGridDBColumn
         Caption = #20986#21040#35745#21010#21333
         DataBinding.FieldName = 'ToOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 82
@@ -519,12 +540,14 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column12: TcxGridDBColumn
         Caption = #20986#21040#21333#20301
         DataBinding.FieldName = 'ToCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 78
       end
       object Tv1Column1: TcxGridDBColumn
         Caption = #26469#33258#35745#21010#21333
         DataBinding.FieldName = 'FromOrdNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 96
@@ -532,6 +555,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object v1Column19: TcxGridDBColumn
         Caption = #21305#25968
         DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 51
@@ -540,6 +564,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #25968#37327
         DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -549,6 +574,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 58
@@ -556,12 +582,14 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column8: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 52
       end
       object Tv1Column2: TcxGridDBColumn
         Caption = #21305#37325
         DataBinding.FieldName = 'PieceWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -570,12 +598,14 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
         Tag = 2
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         Options.Editing = False
         Width = 79
       end
       object Tv1Column4: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -583,6 +613,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column3: TcxGridDBColumn
         Caption = #33394#21035
         DataBinding.FieldName = 'C_ColorDepth'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 73
@@ -590,6 +621,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column9: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -597,6 +629,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column10: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -604,6 +637,7 @@ inherited frmTradeFinishClothOutList: TfrmTradeFinishClothOutList
       object Tv1Column11: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66

T02贸易汇总仓库/U_TradeFinishClothOutList.pas

@@ -12,7 +12,8 @@ uses
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmTradeFinishClothOutList = class(TfrmBaseList)

T03贸易布匹检验/TradeInsp.dproj

@@ -124,7 +124,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\骉骐\T03贸易布匹检验\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myBiaoqi\T03贸易布匹检验\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

T03贸易布匹检验/TradeInsp.dproj.local

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.966,=D:\Dp10Repo\项目代码\骉骐\T03贸易布匹检验\U_TradePack.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.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj</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.966,=D:\Dp10Repo\项目代码\骉骐\T03贸易布匹检验\U_TradePack.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.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.589,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
@@ -33,7 +33,7 @@
     <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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.174,=D:\Dp10Repo\项目代码\骉骐\T03贸易布匹检验\U_TradeClothWaitPack.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
@@ -66,7 +66,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\骉骐"/>
+    <File Path="..\..\D10myBiaoqi"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>

T03贸易布匹检验/U_DataLink.pas

@@ -5,7 +5,23 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList;
+  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, dxSkinBasic,
+  dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee,
+  dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful,
+  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
+  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue;
 
 type
   TMyThread = class(TThread)

T03贸易布匹检验/U_TradeClothInspList.dfm

@@ -130,6 +130,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object Tv1: TcxGridDBTableView
       OnMouseUp = Tv1MouseUp
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
@@ -206,6 +207,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column22: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -216,6 +218,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column21: TcxGridDBColumn
         Caption = #25171#30721#26102#38388
         DataBinding.FieldName = 'FillTime'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -223,6 +226,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column32: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'conNO'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -230,6 +234,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column1: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -237,6 +242,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column4: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -244,6 +250,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column13: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -251,6 +258,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column4: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -258,6 +266,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column9: TcxGridDBColumn
         Caption = #30133#28857#25968#37327
         DataBinding.FieldName = 'CIFNumber'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -265,6 +274,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column7: TcxGridDBColumn
         Caption = #30133#28857#24773#20917
         DataBinding.FieldName = 'FlawList'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 122
@@ -272,12 +282,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column9: TcxGridDBColumn
         Caption = #30133#28857#22791#27880
         DataBinding.FieldName = 'FwNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 108
       end
       object v1Column17: TcxGridDBColumn
         Caption = #29366#24577
         DataBinding.FieldName = 'CIIOFlag'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -285,6 +297,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column18: TcxGridDBColumn
         Caption = #26579#21378#32568#21495
         DataBinding.FieldName = 'FtyPCId'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -292,6 +305,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column23: TcxGridDBColumn
         Caption = #21367#21495
         DataBinding.FieldName = 'PieceNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -299,6 +313,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column8: TcxGridDBColumn
         Caption = #27611#37325
         DataBinding.FieldName = 'GrossWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -306,6 +321,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column27: TcxGridDBColumn
         Caption = #30382#37325
         DataBinding.FieldName = 'Tare'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -313,6 +329,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column28: TcxGridDBColumn
         Caption = #20928#37325
         DataBinding.FieldName = 'NetWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -320,6 +337,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column10: TcxGridDBColumn
         Caption = #31859#25968
         DataBinding.FieldName = 'Meter'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -327,6 +345,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column10: TcxGridDBColumn
         Caption = #30721#25968
         DataBinding.FieldName = 'Yardage'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -334,6 +353,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column20: TcxGridDBColumn
         Caption = #25171#30721#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -341,6 +361,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column14: TcxGridDBColumn
         Caption = #25187#20998
         DataBinding.FieldName = 'KouFenQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         VisibleForCustomization = False
@@ -349,6 +370,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column12: TcxGridDBColumn
         Caption = #21697#36136
         DataBinding.FieldName = 'Grade'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -356,6 +378,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column42: TcxGridDBColumn
         Caption = #24635#35760#24405#25968
         DataBinding.FieldName = 'TotalCount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -363,6 +386,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column6: TcxGridDBColumn
         Caption = #21367#26465#30721
         DataBinding.FieldName = 'CIID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -370,6 +394,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column7: TcxGridDBColumn
         Caption = #23458#25143#33457#22411
         DataBinding.FieldName = 'C_CustPattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -377,6 +402,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column3: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -384,6 +410,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column5: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -391,6 +418,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1MKXS: TcxGridDBColumn
         Caption = #25442#31639#31995#25968
         DataBinding.FieldName = 'Coefficient'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -398,6 +426,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column34: TcxGridDBColumn
         Caption = #32568#26465#30721
         DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -405,6 +434,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column40: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -412,6 +442,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object v1Column46: TcxGridDBColumn
         Caption = #26816#39564#26426#21488
         DataBinding.FieldName = 'CIMachNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -419,6 +450,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column5: TcxGridDBColumn
         Caption = #21253#21495
         DataBinding.FieldName = 'PacketNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -426,6 +458,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column8: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -433,6 +466,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column3: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -440,6 +474,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column1: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -447,6 +482,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column2: TcxGridDBColumn
         Caption = #33521#25991#39068#33394
         DataBinding.FieldName = 'C_EColor'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -454,6 +490,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       object Tv1Column6: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNO'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 59
       end
@@ -568,6 +605,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     Color = 16242829
     ParentBackground = False
     TabOrder = 1
+    ExplicitTop = 39
     object Label3: TLabel
       Left = 195
       Top = 10
@@ -583,12 +621,12 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       ParentFont = False
     end
     object TLabel
-      Left = 362
+      Left = 356
       Top = 10
-      Width = 39
+      Width = 52
       Height = 12
       Hint = '0'
-      Caption = #21512#21516#21495
+      Caption = #23458#25143#21333#21495
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12
@@ -653,7 +691,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       ParentFont = False
     end
     object Label5: TLabel
-      Left = 362
+      Left = 356
       Top = 40
       Width = 39
       Height = 12
@@ -772,7 +810,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     end
     object OrderNo: TEdit
       Tag = 2
-      Left = 248
+      Left = 250
       Top = 6
       Width = 100
       Height = 20
@@ -780,7 +818,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       TabOrder = 1
       OnKeyPress = OrderNoKeyPress
     end
-    object conNO: TEdit
+    object BuyConNo: TEdit
       Tag = 2
       Left = 406
       Top = 6
@@ -788,7 +826,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       Height = 20
       Hint = '0'
       TabOrder = 7
-      OnKeyPress = conNOKeyPress
+      OnKeyPress = BuyConNoKeyPress
     end
     object CIID: TEdit
       Tag = 2
@@ -826,7 +864,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       Height = 20
       Hint = '0'
       TabOrder = 2
-      OnKeyPress = conNOKeyPress
+      OnKeyPress = BuyConNoKeyPress
     end
     object CIIOFlag: TComboBox
       Tag = 2
@@ -864,7 +902,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       Height = 20
       Hint = '0'
       TabOrder = 8
-      OnKeyPress = conNOKeyPress
+      OnKeyPress = BuyConNoKeyPress
     end
     object IsJYTime: TCheckBox
       Left = 9
@@ -914,8 +952,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     end
     object C_Code: TEdit
       Tag = 2
-      Left = 248
+      Left = 250
-      Top = 36
+      Top = 32
       Width = 100
       Height = 20
       Hint = '0'

T03贸易布匹检验/U_TradeClothInspList.pas

@@ -14,7 +14,23 @@ uses
   RM_e_Jpeg, RM_e_txt, RM_e_csv, Math, Clipbrd, cxPC, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, U_BaseList, dxDateTimeWheelPicker,
-  RM_RichEdit;
+  RM_RichEdit, dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint,
+  dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue, dxScrollbarAnnotations;
 
 type
   TfrmTradeClothInspList = class(TfrmBaseList)
@@ -33,7 +49,7 @@ type
     OrderNo: TEdit;
     TBExport: TToolButton;
     Order_Main: TClientDataSet;
-    conNO: TEdit;
+    BuyConNo: TEdit;
     Label7: TLabel;
     Label8: TLabel;
     Label10: TLabel;
@@ -131,7 +147,7 @@ type
     procedure BTNPClick(Sender: TObject);
     procedure TCBNORChange(Sender: TObject);
     procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
-    procedure conNOKeyPress(Sender: TObject; var Key: Char);
+    procedure BuyConNoKeyPress(Sender: TObject; var Key: Char);
     procedure CIIOFlagChange(Sender: TObject);
     procedure GradeChange(Sender: TObject);
     procedure KHConNOKeyPress(Sender: TObject; var Key: Char);
@@ -629,7 +645,7 @@ begin
   InitGrid();
 end;
 
-procedure TfrmTradeClothInspList.conNOKeyPress(Sender: TObject; var Key: Char);
+procedure TfrmTradeClothInspList.BuyConNoKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #13 then
   begin

T03贸易布匹检验/U_TradeMachInsp.dfm

@@ -7,6 +7,7 @@
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  ExplicitLeft = -180
   ExplicitWidth = 1556
   ExplicitHeight = 809
   PixelsPerInch = 96
@@ -1810,8 +1811,8 @@
         OnClick = CIFBegClick
       end
       object Button1: TButton
-        Left = 166
+        Left = 171
-        Top = 306
+        Top = 307
         Width = 66
         Height = 43
         Caption = #30830#23450
@@ -2084,6 +2085,7 @@
       object Tv3: TcxGridDBTableView
         OnMouseDown = Tv3MouseDown
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         OnCustomDrawCell = Tv3CustomDrawCell
         DataController.DataSource = DS_3
         DataController.Filter.AutoDataSetFilter = True
@@ -2135,6 +2137,7 @@
         object v3Column1: TcxGridDBColumn
           Caption = #21367#21495
           DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 40
@@ -2142,6 +2145,7 @@
         object Tv3Column3: TcxGridDBColumn
           Caption = #30721#25968
           DataBinding.FieldName = 'Yardage'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 62
@@ -2149,6 +2153,7 @@
         object Tv3Column1: TcxGridDBColumn
           Caption = #31859#25968
           DataBinding.FieldName = 'Meter'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 62
@@ -2156,6 +2161,7 @@
         object v3Column5: TcxGridDBColumn
           Caption = #20928#37325
           DataBinding.FieldName = 'NetWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Sorting = False
@@ -2164,6 +2170,7 @@
         object v3Column4: TcxGridDBColumn
           Caption = #27611#37325
           DataBinding.FieldName = 'GrossWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Sorting = False
@@ -2172,6 +2179,7 @@
         object Tv3Column4: TcxGridDBColumn
           Caption = #31561#32423
           DataBinding.FieldName = 'Grade'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 54
@@ -2179,6 +2187,7 @@
         object cxGridDBColumn1: TcxGridDBColumn
           Caption = #21367#26465#30721
           DataBinding.FieldName = 'CIID'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Sorting = False
@@ -2187,6 +2196,7 @@
         object Tv3Column2: TcxGridDBColumn
           Caption = #25209#21495
           DataBinding.FieldName = 'BatchNO'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 56
         end
@@ -2211,10 +2221,6 @@
       object cxTabSheet1: TcxTabSheet
         Caption = #24405#20837
         ImageIndex = 0
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object cxGrid2: TcxGrid
           Left = 0
           Top = 0
@@ -2222,9 +2228,9 @@
           Height = 169
           Align = alClient
           TabOrder = 0
-          ExplicitTop = 1
           object Tv2: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
+            ScrollbarAnnotations.CustomAnnotations = <>
             OnCellDblClick = Tv2CellDblClick
             DataController.DataSource = DS_2
             DataController.Filter.AutoDataSetFilter = True
@@ -2253,6 +2259,7 @@
             object tv2CDType: TcxGridDBColumn
               Caption = #30133#28857#21517#31216
               DataBinding.FieldName = 'CIFName'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Options.Focusing = False
               Options.Sorting = False
@@ -2261,6 +2268,7 @@
             object tv2CDWZ: TcxGridDBColumn
               Caption = #20301#32622#36215
               DataBinding.FieldName = 'CIFbeg'
+              DataBinding.IsNullValueType = True
               PropertiesClassName = 'TcxTextEditProperties'
               HeaderAlignmentHorz = taCenter
               HeaderGlyphAlignmentHorz = taCenter
@@ -2272,6 +2280,7 @@
             object v2Column2: TcxGridDBColumn
               Caption = #20301#32622#27490
               DataBinding.FieldName = 'CIFend'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               HeaderGlyphAlignmentHorz = taCenter
               Styles.Content = cxStyle1
@@ -2281,6 +2290,7 @@
             object Tv2CDQty: TcxGridDBColumn
               Caption = #38271#24230
               DataBinding.FieldName = 'CIFQty'
+              DataBinding.IsNullValueType = True
               PropertiesClassName = 'TcxTextEditProperties'
               HeaderAlignmentHorz = taCenter
               Options.Sorting = False
@@ -2289,6 +2299,7 @@
             object Tv2CDReason: TcxGridDBColumn
               Caption = #21407#22240
               DataBinding.FieldName = 'CDReason'
+              DataBinding.IsNullValueType = True
               Visible = False
               HeaderAlignmentHorz = taCenter
               Options.Sorting = False
@@ -2298,12 +2309,14 @@
             end
             object v2Column1: TcxGridDBColumn
               DataBinding.FieldName = 'CDQty'
+              DataBinding.IsNullValueType = True
               Visible = False
               Width = 60
             end
             object v2Column3: TcxGridDBColumn
               Caption = #25187#20998
               DataBinding.FieldName = 'CIFPoints'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Options.Editing = False
               Width = 54
@@ -2311,6 +2324,7 @@
             object v2Column4: TcxGridDBColumn
               Caption = #20010#25968
               DataBinding.FieldName = 'CIFNumber'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Options.Editing = False
               Width = 36
@@ -2318,6 +2332,7 @@
             object Tv2Column1: TcxGridDBColumn
               Caption = #30133#28857#22791#27880
               DataBinding.FieldName = 'FwNote'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Width = 114
             end
@@ -2339,6 +2354,7 @@
           TabOrder = 0
           object TV1: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
+            ScrollbarAnnotations.CustomAnnotations = <>
             DataController.DataSource = DS_1
             DataController.Filter.AutoDataSetFilter = True
             DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -2366,6 +2382,7 @@
             object cxGridDBColumn2: TcxGridDBColumn
               Caption = #30133#28857#21517#31216
               DataBinding.FieldName = 'CIFName'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Options.Focusing = False
               Options.Sorting = False
@@ -2374,6 +2391,7 @@
             object cxGridDBColumn3: TcxGridDBColumn
               Caption = #20301#32622#36215
               DataBinding.FieldName = 'CIFbeg'
+              DataBinding.IsNullValueType = True
               PropertiesClassName = 'TcxTextEditProperties'
               HeaderAlignmentHorz = taCenter
               HeaderGlyphAlignmentHorz = taCenter
@@ -2385,6 +2403,7 @@
             object cxGridDBColumn4: TcxGridDBColumn
               Caption = #20301#32622#27490
               DataBinding.FieldName = 'CIFend'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               HeaderGlyphAlignmentHorz = taCenter
               Styles.Content = cxStyle1
@@ -2394,6 +2413,7 @@
             object cxGridDBColumn5: TcxGridDBColumn
               Caption = #38271#24230
               DataBinding.FieldName = 'CIFQty'
+              DataBinding.IsNullValueType = True
               PropertiesClassName = 'TcxTextEditProperties'
               HeaderAlignmentHorz = taCenter
               Options.Sorting = False
@@ -2402,6 +2422,7 @@
             object cxGridDBColumn6: TcxGridDBColumn
               Caption = #21407#22240
               DataBinding.FieldName = 'CDReason'
+              DataBinding.IsNullValueType = True
               Visible = False
               HeaderAlignmentHorz = taCenter
               Options.Sorting = False
@@ -2411,12 +2432,14 @@
             end
             object cxGridDBColumn7: TcxGridDBColumn
               DataBinding.FieldName = 'CDQty'
+              DataBinding.IsNullValueType = True
               Visible = False
               Width = 60
             end
             object cxGridDBColumn8: TcxGridDBColumn
               Caption = #25187#20998
               DataBinding.FieldName = 'CIFPoints'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Options.Editing = False
               Width = 54
@@ -2424,6 +2447,7 @@
             object cxGridDBColumn9: TcxGridDBColumn
               Caption = #20010#25968
               DataBinding.FieldName = 'CIFNumber'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Options.Editing = False
               Width = 36
@@ -2431,6 +2455,7 @@
             object TV1Column1: TcxGridDBColumn
               Caption = #30133#28857#22791#27880
               DataBinding.FieldName = 'FwNote'
+              DataBinding.IsNullValueType = True
               HeaderAlignmentHorz = taCenter
               Width = 122
             end

T03贸易布匹检验/U_TradeMachInsp.pas

@@ -14,7 +14,23 @@ uses
   U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
   dxBarBuiltInMenu, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent,
   IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, ShellAPI, IdFTP,
-  FireDAC.Stan.StorageXML, cxPC, RM_RichEdit;
+  FireDAC.Stan.StorageXML, cxPC, RM_RichEdit, dxSkinBasic, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue, dxScrollbarAnnotations;
 
 type
   TfrmTradeMachInsp = class(TfrmBaseList)
@@ -1728,7 +1744,15 @@ begin
     FieldByName('CIFName').Value := Trim(FCIFName);
     FieldByName('CIFbeg').Value := Trim(CIFBeg.Text);
     FieldByName('CIFEnd').Value := Trim(CIFEnd.Text);
-    FieldByName('FwNote').Value := Trim(FwNote.Text);
+//    FieldByName('FwNote').Value := Trim(FwNote.Text);
+    if RadioGroup1.ItemIndex = 5 then
+    begin
+      FieldByName('FwNote').Value := 'Á¬ÐøÐÔ' + Trim(FwNote.text);
+    end
+    else if RadioGroup1.ItemIndex = 4 then
+    begin
+      FieldByName('FwNote').Value := 'ÕûÆ¥' + Trim(FwNote.Text);
+    end;
     FieldByName('CIFPoints').Value := 0;
 
     if RadioGroup1.ItemIndex > -1 then

T04贸易明细仓库/U_TradeClothInEdit.dfm

@@ -2,7 +2,8 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
   Caption = #25104#21697#20837#24211#25195#25551
   ClientHeight = 632
   ClientWidth = 1350
-  ExplicitLeft = -116
+  ExplicitLeft = -208
+  ExplicitTop = -62
   ExplicitWidth = 1366
   ExplicitHeight = 671
   PixelsPerInch = 96
@@ -22,9 +23,9 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
       Height = 423
       Align = alClient
       TabOrder = 0
-      ExplicitWidth = 607
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_1
         DataController.Filter.AutoDataSetFilter = True
         DataController.Summary.DefaultGroupSummaryItems = <>
@@ -63,6 +64,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v1Column6: TcxGridDBColumn
           Caption = #36873#25321
           DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
           Properties.NullStyle = nssUnchecked
           HeaderAlignmentHorz = taCenter
@@ -73,12 +75,14 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v1Column11: TcxGridDBColumn
           Caption = #21367#26465#30721
           DataBinding.FieldName = 'StkId'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 75
         end
         object v1Column5: TcxGridDBColumn
           Caption = #21367#21495
           DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Filtering = False
@@ -87,6 +91,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v1Column3: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Filtering = False
@@ -95,12 +100,14 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object Tv1Column1: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 62
         end
         object v1Column4: TcxGridDBColumn
           Caption = #21345#21495
           DataBinding.FieldName = 'PCID'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 41
@@ -108,6 +115,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v2Column6: TcxGridDBColumn
           Caption = #31859#25968
           DataBinding.FieldName = 'StkMeter'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Filtering = False
@@ -116,6 +124,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v2Column5: TcxGridDBColumn
           Caption = #27611#37325
           DataBinding.FieldName = 'StkGrossWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Filtering = False
@@ -124,15 +133,24 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object Tv1Column2: TcxGridDBColumn
           Caption = #32568#21495
           DataBinding.FieldName = 'BatchNO'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 66
         end
         object Tv1Column3: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 59
         end
+        object Tv1Column4: TcxGridDBColumn
+          Caption = #31867#22411
+          DataBinding.FieldName = 'Grade'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 56
+        end
       end
       object cxGrid1Level1: TcxGridLevel
         GridView = Tv1
@@ -268,6 +286,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
       TabOrder = 0
       object Tv2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         OnCellDblClick = Tv2CellDblClick
         DataController.DataSource = DS_2
         DataController.Filter.AutoDataSetFilter = True
@@ -284,6 +303,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v1OrderNo: TcxGridDBColumn
           Caption = #35745#21010#21333#21495
           DataBinding.FieldName = 'OrderNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Focusing = False
           Options.Sorting = False
@@ -292,6 +312,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v2Column2: TcxGridDBColumn
           Caption = #23458#25143
           DataBinding.FieldName = 'CustName'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Focusing = False
           Width = 123
@@ -299,6 +320,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object cxGridDBColumn2: TcxGridDBColumn
           Caption = #20135#21697#21517#31216
           DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Focusing = False
           Options.Sorting = False
@@ -307,6 +329,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object cxGridDBColumn3: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Focusing = False
           Options.Sorting = False
@@ -315,12 +338,14 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object Tv2Column2: TcxGridDBColumn
           Caption = #21305#25968
           DataBinding.FieldName = 'OrdPiece'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 48
         end
         object v1Column10: TcxGridDBColumn
           Caption = #25968#37327
           DataBinding.FieldName = 'OrdQty'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Focusing = False
           Width = 51
@@ -328,6 +353,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v1Column14: TcxGridDBColumn
           Caption = #21333#20301
           DataBinding.FieldName = 'OrdUnit'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Focusing = False
           Width = 42
@@ -335,6 +361,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v1PRTMF: TcxGridDBColumn
           Caption = #38376#24133
           DataBinding.FieldName = 'C_Width'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Focusing = False
           Options.Sorting = False
@@ -343,6 +370,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v1PRTKZ: TcxGridDBColumn
           Caption = #20811#37325
           DataBinding.FieldName = 'C_GramWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Focusing = False
           Options.Sorting = False
@@ -351,12 +379,14 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object Tv2Column1: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 57
         end
         object Tv2Column3: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 72
         end
@@ -372,8 +402,6 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
       Height = 165
       Align = alClient
       TabOrder = 1
-      ExplicitLeft = 609
-      ExplicitWidth = 739
       object Label4: TLabel
         Left = 198
         Top = 55
@@ -460,7 +488,6 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         ParentFont = False
         ShowCaptions = True
         TabOrder = 3
-        ExplicitWidth = 737
         object btnGetOutNo: TToolButton
           Left = 0
           Top = 0
@@ -518,8 +545,6 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
     Align = alClient
     Caption = 'Panel2'
     TabOrder = 1
-    ExplicitLeft = 609
-    ExplicitWidth = 741
     object cxGrid3: TcxGrid
       Left = 1
       Top = 39
@@ -527,9 +552,9 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
       Height = 423
       Align = alClient
       TabOrder = 0
-      ExplicitWidth = 739
       object Tv3: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_3
         DataController.Filter.AutoDataSetFilter = True
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -561,6 +586,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v3Column5: TcxGridDBColumn
           Caption = #36873#25321
           DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
           Properties.ImmediatePost = True
           Properties.NullStyle = nssUnchecked
@@ -571,6 +597,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object cxGridDBColumn4: TcxGridDBColumn
           Caption = #21367#21495
           DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 52
@@ -578,6 +605,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v3MJID: TcxGridDBColumn
           Caption = #21367#26465#30721
           DataBinding.FieldName = 'StkId'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 60
@@ -585,6 +613,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v3Column3: TcxGridDBColumn
           Caption = #39068#33394
           DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 66
@@ -592,12 +621,14 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object Tv3Column1: TcxGridDBColumn
           Caption = #33394#21495
           DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 67
         end
         object v3Column4: TcxGridDBColumn
           Caption = #21345#21495
           DataBinding.FieldName = 'PCID'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 65
@@ -605,6 +636,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object cxGridDBColumn6: TcxGridDBColumn
           Caption = #31859#25968
           DataBinding.FieldName = 'StkMeter'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Focusing = False
@@ -613,6 +645,7 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object v3Column1: TcxGridDBColumn
           Caption = #27611#37325
           DataBinding.FieldName = 'StkGrossWeight'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 59
@@ -620,15 +653,24 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
         object Tv3Column2: TcxGridDBColumn
           Caption = #32568#21495
           DataBinding.FieldName = 'BatchNO'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 66
         end
         object Tv3Column3: TcxGridDBColumn
           Caption = #33457#22411
           DataBinding.FieldName = 'C_Pattern'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 53
         end
+        object Tv3Column4: TcxGridDBColumn
+          Caption = #31867#22411
+          DataBinding.FieldName = 'Grade'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 51
+        end
       end
       object cxGridLevel1: TcxGridLevel
         GridView = Tv3
@@ -656,7 +698,6 @@ inherited frmTradeClothInEdit: TfrmTradeClothInEdit
       ParentFont = False
       ShowCaptions = True
       TabOrder = 1
-      ExplicitWidth = 739
       object ToolButton11: TToolButton
         Left = 0
         Top = 0

T04贸易明细仓库/U_TradeClothInEdit.pas

@@ -11,7 +11,8 @@ uses
   cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
-  RM_GridReport, RM_Dataset, Vcl.ToolWin, BtnEdit;
+  RM_GridReport, RM_Dataset, Vcl.ToolWin, BtnEdit, dxSkinWXI,
+  dxScrollbarAnnotations;
 
 type
   TfrmTradeClothInEdit = class(TfrmBaseList)
@@ -98,6 +99,8 @@ type
     Button1: TButton;
     Button2: TButton;
     StkType: TBtnEditC;
+    Tv1Column4: TcxGridDBColumn;
+    Tv3Column4: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);

T04贸易明细仓库/U_TradeClothOutList.dfm

@@ -447,6 +447,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
     TabOrder = 3
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
@@ -519,6 +520,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column22: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -529,6 +531,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column21: TcxGridDBColumn
         Caption = #20986#24211#26102#38388
         DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 103
@@ -536,10 +539,12 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column11: TcxGridDBColumn
         Caption = #20986#24211#31867#22411
         DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
       end
       object Tv1Column9: TcxGridDBColumn
         Caption = #20986#24211#21333#21495
         DataBinding.FieldName = 'IONO'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 82
@@ -547,6 +552,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column32: TcxGridDBColumn
         Caption = #21512#21516#21495
         DataBinding.FieldName = 'ConNO'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 76
@@ -554,6 +560,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column1: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
         DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 92
@@ -561,6 +568,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column4: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 74
@@ -568,6 +576,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column13: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -575,6 +584,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column4: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -582,6 +592,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column23: TcxGridDBColumn
         Caption = #21367#21495
         DataBinding.FieldName = 'PieceNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -589,6 +600,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column8: TcxGridDBColumn
         Caption = #27611#37325
         DataBinding.FieldName = 'GrossWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -596,6 +608,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column27: TcxGridDBColumn
         Caption = #30382#37325
         DataBinding.FieldName = 'Tare'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -603,6 +616,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column28: TcxGridDBColumn
         Caption = #20928#37325
         DataBinding.FieldName = 'NetWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -610,6 +624,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column10: TcxGridDBColumn
         Caption = #31859#25968
         DataBinding.FieldName = 'Meter'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -617,12 +632,14 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column12: TcxGridDBColumn
         Caption = #24211#20301
         DataBinding.FieldName = 'IOPosition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 71
       end
       object Tv1Column10: TcxGridDBColumn
         Caption = #30721#25968
         DataBinding.FieldName = 'Yardage'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -630,6 +647,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column12: TcxGridDBColumn
         Caption = #21697#36136
         DataBinding.FieldName = 'Grade'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -637,6 +655,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column42: TcxGridDBColumn
         Caption = #24635#35760#24405#25968
         DataBinding.FieldName = 'TotalCount'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -644,6 +663,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column6: TcxGridDBColumn
         Caption = #21367#26465#30721
         DataBinding.FieldName = 'CIID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -651,6 +671,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column7: TcxGridDBColumn
         Caption = #23458#25143#33457#22411
         DataBinding.FieldName = 'C_CustPattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -658,6 +679,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column3: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -665,6 +687,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column5: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -672,6 +695,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object v1Column40: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -679,6 +703,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column5: TcxGridDBColumn
         Caption = #21253#21495
         DataBinding.FieldName = 'PacketNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -686,11 +711,13 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object VC_BaoID: TcxGridDBColumn
         Caption = #21253#26465#30721
         DataBinding.FieldName = 'PacketId'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column8: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -698,6 +725,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column3: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -705,6 +733,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column1: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -712,6 +741,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column2: TcxGridDBColumn
         Caption = #33521#25991#39068#33394
         DataBinding.FieldName = 'C_EColor'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -719,6 +749,7 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
       object Tv1Column6: TcxGridDBColumn
         Caption = #25209#21495
         DataBinding.FieldName = 'BatchNO'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 66
       end

T04贸易明细仓库/U_TradeClothOutList.pas

@@ -13,7 +13,7 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
-  System.StrUtils;
+  System.StrUtils, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmTradeClothOutList = class(TfrmBaseList)

T04贸易明细仓库/U_TradeClothOutListNew.dfm

@@ -7,7 +7,6 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitLeft = -368
   ExplicitWidth = 1556
   ExplicitHeight = 639
   PixelsPerInch = 96
@@ -109,7 +108,6 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 5
     OnChange = cxPageControl1Change
-    ExplicitTop = 44
     ClientRectBottom = 562
     ClientRectRight = 1540
     ClientRectTop = 32

T04贸易明细仓库/U_TradeClothOutListNew.pas

@@ -314,6 +314,22 @@ begin
         begin
           Close;
           sql.Clear;
+
+//          sql.Add(' with a as(  ');
+//          sql.Add(' select DISTINCT  A.IOID,A.StkId,A.IOCycles,A.IONo,A.IOTime,A.IOFlag,A.IOType,A.IOPosition,A.Tare,A.GrossWeight,A.NetWeight,A.Meter,A.Yardage ');
+//          sql.Add(',A.FillId,A.Filler,A.Filltime,A.EditId,A.Editer,A.Edittime,A.DelId,A.Deler,A.Deltime,REPLACE(REPLACE(IONote, CHAR(10), ''''), CHAR(13), '''') AS IONote');
+//          sql.Add(',B.CIID,B.StkCycles,B.StkExists,B.ConMId,B.ConSId,B.OrderNo,B.MainId,B.SubId,B.PCID,B.BCIOID,B.PacketId,B.PacketNo,B.PacketTime,B.PacketName,B.PacketCode,B.PieceNo,B.CoefficientType,B.Coefficient  ');
+//          sql.Add(',B.StkPosition,B.StkGrossWeight,B.StkTare,B.StkNetWeight,B.StkMeter,B.StkYardage,B.Grade,B.BatchNo,B.CIMachNo,B.Loom,B.C_Code,B.C_Name,B.C_EName,B.C_Spec,B.C_Composition,B.C_EComposition,B.C_Color ');
+//          sql.Add(',B.C_Width,B.C_GramWeight,B.C_Pattern,B.C_ColorNo,B.C_EColor  ');
+//          sql.Add(',B.C_StyleNo,B.C_CustPattern,B.STKName,B.Workshop,B.FtyPCId  ');
+//          sql.Add(',C.CustName,C.Saleser,D.BuyConNo,C.ConNo ');
+//          sql.Add('from Trade_Cloth_IO A inner join Trade_Cloth_Stock B on A.STKID=B.StkId ');
+//          sql.Add(' left join Trade_Plan_Main C on B.MainId=C.MainId ');
+//          sql.Add('left join Trade_Plan_Sub D on D.MainId= C.MainID ');
+//          sql.Add(' where 1=1');
+//          sql.Add(WSql);
+//          sql.Add(')');
+
           sql.Add(' select  IOTime=CONVERT(VARCHAR(10),IOTime,120),OrderNo,C_Name,PCId,IOType,Grade,CustName,C_Width,C_GramWeight');
           sql.Add(' ,CIMachNo,Workshop,BatchNo,IOPosition,IONote,C_Color,C_Pattern,Saleser,C_ColorNo,ConNo,BuyConNo,C_Code,IoNo ');
           sql.Add(' ,COUNT(PieceNo) SumPieceNo,sum(GrossWeight) SumGrossWeight,sum(Tare) SumTare,sum(NetWeight) SumNetWeight');
@@ -344,6 +360,21 @@ begin
           Filtered := False;
           Close;
           sql.Clear;
+//          sql.Add(' with a as(  ');
+//          sql.Add(' select DISTINCT  A.IOID,A.StkId,A.IOCycles,A.IONo,A.IOTime,A.IOFlag,A.IOType,A.IOPosition,A.Tare,A.GrossWeight,A.NetWeight,A.Meter,A.Yardage ');
+//          sql.Add(',A.FillId,A.Filler,A.Filltime,A.EditId,A.Editer,A.Edittime,A.DelId,A.Deler,A.Deltime,REPLACE(REPLACE(IONote, CHAR(10), ''''), CHAR(13), '''') AS IONote');
+//          sql.Add(',B.CIID,B.StkCycles,B.StkExists,B.ConMId,B.ConSId,B.OrderNo,B.MainId,B.SubId,B.PCID,B.BCIOID,B.PacketId,B.PacketNo,B.PacketTime,B.PacketName,B.PacketCode,B.PieceNo,B.CoefficientType,B.Coefficient  ');
+//          sql.Add(',B.StkPosition,B.StkGrossWeight,B.StkTare,B.StkNetWeight,B.StkMeter,B.StkYardage,B.Grade,B.BatchNo,B.CIMachNo,B.Loom,B.C_Code,B.C_Name,B.C_EName,B.C_Spec,B.C_Composition,B.C_EComposition,B.C_Color ');
+//          sql.Add(',B.C_Width,B.C_GramWeight,B.C_Pattern,B.C_ColorNo,B.C_EColor  ');
+//          sql.Add(',B.C_StyleNo,B.C_CustPattern,B.STKName,B.Workshop,B.FtyPCId  ');
+//          sql.Add(',C.CustName,C.Saleser,D.BuyConNo,C.ConNo ');
+//          sql.Add('from Trade_Cloth_IO A inner join Trade_Cloth_Stock B on A.STKID=B.StkId ');
+//          sql.Add(' left join Trade_Plan_Main C on B.MainId=C.MainId ');
+//          sql.Add('left join Trade_Plan_Sub D on D.MainId= C.MainID ');
+//          sql.Add(' where 1=1');
+//          sql.Add(WSql);
+//          sql.Add(')');
+
           sql.Add(' select top ' + inttostr(RecordsNumber) + ' * ');
           sql.Add(' from  ');
           sql.Add('(select  rownumber=cast((row_number() over(order by A.IOTime desc)) as int)');

T04贸易明细仓库/U_TradeClothSplit.dfm

@@ -35,7 +35,7 @@ object frmTradeClothSplit: TfrmTradeClothSplit
     end
     object Button1: TButton
       Left = 208
-      Top = 38
+      Top = 37
       Width = 75
       Height = 21
       Caption = #30830#35748

T04贸易明细仓库/U_TradeClothSplit.pas

@@ -51,7 +51,7 @@ begin
     begin
       Close;
       sql.Clear;
-      sql.Add(' exec P_JY_Cloth_CaiPi ');
+      sql.Add(' exec P_Trade_Cloth_Split ');
       sql.Add(' @StkID=' + QuotedStr(FStkID));
       sql.Add(',@SplitMeter=' + Len.Text);
       Sql.Add(',@FillId=' + quotedstr(DCode));

T04贸易明细仓库/U_TradeClothStkListNew.dfm

@@ -63,7 +63,6 @@
       AutoSize = True
       Caption = #25286#21305
       ImageIndex = 23
-      Visible = False
       OnClick = ToolButton1Click
     end
     object TBExport: TToolButton
@@ -524,6 +523,7 @@
         TabOrder = 1
         object TV2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
           OnCellDblClick = TV2CellDblClick
           OnCustomDrawCell = TV2CustomDrawCell
           DataController.DataSource = DS_2
@@ -582,6 +582,10 @@
             item
               Kind = skSum
               Column = cxGridDBColumn7
+            end
+            item
+              Kind = skSum
+              Column = TV2Column12
             end>
           DataController.Summary.SummaryGroups = <>
           OptionsCustomize.ColumnFiltering = False
@@ -596,6 +600,7 @@
           object cxGridDBColumn2: TcxGridDBColumn
             Caption = #20837#24211#26102#38388
             DataBinding.FieldName = 'IOTime'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 70
@@ -603,6 +608,7 @@
           object cxGridDBColumn13: TcxGridDBColumn
             Caption = #20837#24211#31867#22411
             DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 74
@@ -611,6 +617,7 @@
             Tag = 11
             Caption = #35745#21010#21333#21495
             DataBinding.FieldName = 'OrderNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 83
@@ -618,6 +625,7 @@
           object cxGridDBColumn4: TcxGridDBColumn
             Caption = #20135#21697#21517#31216
             DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -625,12 +633,14 @@
           object TV2Column9: TcxGridDBColumn
             Caption = #20135#21697#32534#21495
             DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 87
           end
           object cxGridDBColumn5: TcxGridDBColumn
             Caption = #23458#25143
             DataBinding.FieldName = 'CustName'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -638,6 +648,7 @@
           object cxGridDBColumn7: TcxGridDBColumn
             Caption = #21367#25968
             DataBinding.FieldName = 'SumPieceNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -645,6 +656,7 @@
           object cxGridDBColumn8: TcxGridDBColumn
             Caption = #27611#37325
             DataBinding.FieldName = 'SumGrossWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -652,6 +664,7 @@
           object cxGridDBColumn9: TcxGridDBColumn
             Caption = #30382#37325
             DataBinding.FieldName = 'SumTare'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -659,6 +672,7 @@
           object cxGridDBColumn10: TcxGridDBColumn
             Caption = #20928#37325
             DataBinding.FieldName = 'SumNetWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -666,6 +680,7 @@
           object cxGridDBColumn11: TcxGridDBColumn
             Caption = #31859#25968
             DataBinding.FieldName = 'SumMeter'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -673,6 +688,7 @@
           object cxGridDBColumn12: TcxGridDBColumn
             Caption = #30721#25968
             DataBinding.FieldName = 'SumYardage'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -680,6 +696,7 @@
           object cxGridDBColumn14: TcxGridDBColumn
             Caption = #21697#36136
             DataBinding.FieldName = 'Grade'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -687,6 +704,7 @@
           object cxGridDBColumn15: TcxGridDBColumn
             Caption = #38376#24133
             DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -694,6 +712,7 @@
           object cxGridDBColumn16: TcxGridDBColumn
             Caption = #20811#37325
             DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -701,6 +720,7 @@
           object cxGridDBColumn17: TcxGridDBColumn
             Caption = #26816#39564#26426#21488
             DataBinding.FieldName = 'CIMachNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -708,6 +728,7 @@
           object TV2Column4: TcxGridDBColumn
             Caption = #33457#22411
             DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 57
@@ -715,6 +736,7 @@
           object cxGridDBColumn18: TcxGridDBColumn
             Caption = #26412#21378#32568#21495
             DataBinding.FieldName = 'BatchNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -722,6 +744,7 @@
           object TV2Column1: TcxGridDBColumn
             Caption = #24211#20301
             DataBinding.FieldName = 'IOPosition'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 71
@@ -729,18 +752,21 @@
           object TV2Column10: TcxGridDBColumn
             Caption = #24211#23384#31867#22411
             DataBinding.FieldName = 'StkType'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 92
           end
           object TV2Column3: TcxGridDBColumn
             Caption = #39068#33394
             DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
           end
           object TV2Column2: TcxGridDBColumn
             Caption = #24211#40836
             DataBinding.FieldName = 'kl'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 67
@@ -748,34 +774,46 @@
           object TV2Column5: TcxGridDBColumn
             Caption = #19994#21153#21592
             DataBinding.FieldName = 'Saleser'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column6: TcxGridDBColumn
             Caption = #33394#21495
             DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column7: TcxGridDBColumn
             Caption = #21512#21516#21495
             DataBinding.FieldName = 'ConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column8: TcxGridDBColumn
             Caption = #23458#25143#21333#21495
             DataBinding.FieldName = 'BuyConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column11: TcxGridDBColumn
             Caption = #21333#20215
             DataBinding.FieldName = 'Price'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 58
           end
           object TV2Column12: TcxGridDBColumn
             Caption = #37329#39069
             DataBinding.FieldName = 'Amount'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
+          object TV2Column13: TcxGridDBColumn
+            Caption = #22797#21333#21495
+            DataBinding.FieldName = 'FOrdNo'
+            DataBinding.IsNullValueType = True
+            Width = 71
+          end
         end
         object cxGridLevel1: TcxGridLevel
           GridView = TV2
@@ -1292,9 +1330,9 @@
         ParentFont = False
         PopupMenu = PM_1
         TabOrder = 2
-        ExplicitTop = 99
         object Tv1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
           DataController.DataSource = DS_1
           DataController.Filter.AutoDataSetFilter = True
           DataController.Filter.OnBeforeChange = Tv1DataControllerFilterBeforeChange
@@ -1332,6 +1370,10 @@
             end
             item
               Column = VC_PacketId
+            end
+            item
+              Kind = skSum
+              Column = Tv1Column14
             end>
           DataController.Summary.SummaryGroups = <>
           OptionsCustomize.ColumnFiltering = False
@@ -1346,6 +1388,7 @@
           object v1Column22: TcxGridDBColumn
             Caption = #36873#25321
             DataBinding.FieldName = 'SSel'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxCheckBoxProperties'
             Properties.ImmediatePost = True
             Properties.NullStyle = nssUnchecked
@@ -1356,6 +1399,7 @@
           object v1Column21: TcxGridDBColumn
             Caption = #20837#24211#26102#38388
             DataBinding.FieldName = 'IOTime'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1363,12 +1407,14 @@
           object Tv1Column11: TcxGridDBColumn
             Caption = #20837#24211#31867#22411
             DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
             Options.Editing = False
             Width = 66
           end
           object v1Column32: TcxGridDBColumn
             Caption = #21512#21516#21495
             DataBinding.FieldName = 'ConNO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1376,6 +1422,7 @@
           object v1Column1: TcxGridDBColumn
             Caption = #35745#21010#21333#21495
             DataBinding.FieldName = 'OrderNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1383,6 +1430,7 @@
           object Tv1Column4: TcxGridDBColumn
             Caption = #20135#21697#32534#21495
             DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1390,6 +1438,7 @@
           object v1Column13: TcxGridDBColumn
             Caption = #20135#21697#21517#31216
             DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1397,6 +1446,7 @@
           object v1Column4: TcxGridDBColumn
             Caption = #39068#33394
             DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1404,6 +1454,7 @@
           object v1Column23: TcxGridDBColumn
             Caption = #21367#21495
             DataBinding.FieldName = 'PieceNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1411,6 +1462,7 @@
           object v1Column8: TcxGridDBColumn
             Caption = #27611#37325
             DataBinding.FieldName = 'GrossWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1418,6 +1470,7 @@
           object v1Column27: TcxGridDBColumn
             Caption = #30382#37325
             DataBinding.FieldName = 'Tare'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1425,6 +1478,7 @@
           object v1Column28: TcxGridDBColumn
             Caption = #20928#37325
             DataBinding.FieldName = 'NetWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1432,6 +1486,7 @@
           object v1Column10: TcxGridDBColumn
             Caption = #31859#25968
             DataBinding.FieldName = 'Meter'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1439,6 +1494,7 @@
           object Tv1Column12: TcxGridDBColumn
             Caption = #24211#20301
             DataBinding.FieldName = 'IOPosition'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1446,12 +1502,14 @@
           object Tv1Column9: TcxGridDBColumn
             Caption = #24211#23384#31867#22411
             DataBinding.FieldName = 'StkType'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 73
           end
           object Tv1Column10: TcxGridDBColumn
             Caption = #30721#25968
             DataBinding.FieldName = 'Yardage'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1459,6 +1517,7 @@
           object v1Column12: TcxGridDBColumn
             Caption = #21697#36136
             DataBinding.FieldName = 'Grade'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1466,6 +1525,7 @@
           object v1Column42: TcxGridDBColumn
             Caption = #24635#35760#24405#25968
             DataBinding.FieldName = 'TotalCount'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1473,6 +1533,7 @@
           object v1Column6: TcxGridDBColumn
             Caption = #21367#26465#30721
             DataBinding.FieldName = 'CIID'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1480,6 +1541,7 @@
           object Tv1Column7: TcxGridDBColumn
             Caption = #23458#25143#33457#22411
             DataBinding.FieldName = 'C_CustPattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1487,6 +1549,7 @@
           object v1Column3: TcxGridDBColumn
             Caption = #38376#24133
             DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1494,6 +1557,7 @@
           object v1Column5: TcxGridDBColumn
             Caption = #20811#37325
             DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1501,6 +1565,7 @@
           object v1Column34: TcxGridDBColumn
             Caption = #32568#26465#30721
             DataBinding.FieldName = 'BCIOID'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1508,6 +1573,7 @@
           object v1Column40: TcxGridDBColumn
             Caption = #33457#22411
             DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1515,6 +1581,7 @@
           object v1Column46: TcxGridDBColumn
             Caption = #26816#39564#26426#21488
             DataBinding.FieldName = 'CIMachNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1522,6 +1589,7 @@
           object VC_BaoNo: TcxGridDBColumn
             Caption = #21253#21495
             DataBinding.FieldName = 'PacketNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Styles.Footer = DataLink_TradeClothStk.FontBlue
@@ -1530,6 +1598,7 @@
           object VC_PacketId: TcxGridDBColumn
             Caption = #21253#26465#30721
             DataBinding.FieldName = 'PacketId'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1537,6 +1606,7 @@
           object Tv1Column8: TcxGridDBColumn
             Caption = #23458#25143#21333#21495
             DataBinding.FieldName = 'BuyConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1544,6 +1614,7 @@
           object Tv1Column3: TcxGridDBColumn
             Caption = #33394#21495
             DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1551,6 +1622,7 @@
           object Tv1Column1: TcxGridDBColumn
             Caption = #27454#21495
             DataBinding.FieldName = 'C_StyleNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1558,6 +1630,7 @@
           object Tv1Column2: TcxGridDBColumn
             Caption = #33521#25991#39068#33394
             DataBinding.FieldName = 'C_EColor'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 70
@@ -1565,12 +1638,14 @@
           object Tv1Column6: TcxGridDBColumn
             Caption = #26412#21378#32568#21495
             DataBinding.FieldName = 'BatchNO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 66
           end
           object Tv1Column5: TcxGridDBColumn
             Caption = #27515#36135
             DataBinding.FieldName = 'ISDie'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxCheckBoxProperties'
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
@@ -1579,14 +1654,30 @@
           object Tv1Column13: TcxGridDBColumn
             Caption = #21333#20215
             DataBinding.FieldName = 'Price'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 57
           end
           object Tv1Column14: TcxGridDBColumn
             Caption = #37329#39069
             DataBinding.FieldName = 'Amount'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
+          object Tv1Column15: TcxGridDBColumn
+            Caption = #19994#21153#21592
+            DataBinding.FieldName = 'Saleser'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 60
+          end
+          object Tv1Column16: TcxGridDBColumn
+            Caption = #22797#21333#21495
+            DataBinding.FieldName = 'FOrdNo'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 71
+          end
         end
         object cxGrid1Level1: TcxGridLevel
           GridView = Tv1
@@ -1609,8 +1700,6 @@
           Color = clSkyBlue
           ParentBackground = False
           TabOrder = 0
-          ExplicitLeft = -121
-          ExplicitTop = -6
           object BitBtn1: TBitBtn
             Left = 249
             Top = 1

T04贸易明细仓库/U_TradeClothStkListNew.pas

@@ -13,7 +13,7 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore,
   dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC,
-  System.StrUtils, BtnEdit, Vcl.Buttons;
+  System.StrUtils, BtnEdit, Vcl.Buttons, dxSkinWXI, dxScrollbarAnnotations;
 
 type
   TfrmTradeClothStkListNew = class(TfrmBaseList)
@@ -181,6 +181,9 @@ type
     BitBtn2: TBitBtn;
     BitBtn3: TBitBtn;
     BitBtn1: TBitBtn;
+    Tv1Column15: TcxGridDBColumn;
+    Tv1Column16: TcxGridDBColumn;
+    TV2Column13: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -336,8 +339,9 @@ begin
           Filtered := False;
           Close;
           sql.Clear;
-          sql.Add(' select kl= DATEDIFF(dd,IOTime, GETDATE()),  IOTime=CONVERT(VARCHAR(10),IOTime,120),OrderNo,C_Name,PCId,IOType,Grade,CustName,C_Width,C_GramWeight,CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,StkType,Price');
+          sql.Add(' select kl= DATEDIFF(dd,IOTime, GETDATE()),  IOTime=CONVERT(VARCHAR(10),IOTime,120),OrderNo,C_Name,PCId,IOType');
-
+          Sql.Add(',Grade,CustName,C_Width,C_GramWeight,CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,StkType,Price');
+          sql.Add(',C_Code,Saleser,C_ColorNo,ConNo,BuyConNo,FOrdNo');
           sql.Add(' ,COUNT(PieceNo) SumPieceNo,sum(GrossWeight) SumGrossWeight,sum(Tare) SumTare,sum(NetWeight) SumNetWeight');
           sql.Add(' ,Sum(Meter) SumMeter,Sum(Yardage) SumYardage,Sum(Amount) Amount');
           sql.Add(' from V_Trade_Cloth_Stk A where 1=1 ');
@@ -350,7 +354,9 @@ begin
             sql.Add(' and Grade=''´ÎÆ·'' ');
 
           sql.Add(WSql);
-          sql.Add(' GROUP BY  DATEDIFF(dd,IOTime, GETDATE()),  CONVERT(VARCHAR(10),IOTime,120),OrderNo,C_Name,PCId,IOType,Grade,CustName,C_Width,C_GramWeight,CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,StkType,Price');
+          sql.Add(' GROUP BY  DATEDIFF(dd,IOTime, GETDATE()),  CONVERT(VARCHAR(10),IOTime,120),OrderNo,C_Name,PCId,IOType');
+          sql.Add(',Grade,CustName,C_Width,C_GramWeight,CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,StkType,Price');
+          Sql.Add(',C_Code,Saleser,C_ColorNo,ConNo,BuyConNo,FOrdNo');
 //          showmessage(sql.text);
           Open;
         end;