0429

A01基础公司管理/U_Customer.dfm

@@ -178,6 +178,8 @@ inherited frmCustomer: TfrmCustomer
     Color = 16242829
     ParentBackground = False
     TabOrder = 1
+    ExplicitLeft = -1
+    ExplicitTop = 44
     object Label3: TLabel
       Left = 190
       Top = 13
@@ -193,19 +195,26 @@ inherited frmCustomer: TfrmCustomer
       Caption = #23458#25143#32534#21495
     end
     object Label2: TLabel
-      Left = 350
+      Left = 526
       Top = 13
       Width = 36
       Height = 12
       Caption = #19994#21153#21592
     end
     object Label4: TLabel
-      Left = 502
+      Left = 678
       Top = 13
       Width = 24
       Height = 12
       Caption = #22269#23478
     end
+    object Label5: TLabel
+      Left = 353
+      Top = 13
+      Width = 48
+      Height = 12
+      Caption = #20844#21496#31616#31216
+    end
     object CoName: TEdit
       Tag = 2
       Left = 242
@@ -228,7 +237,7 @@ inherited frmCustomer: TfrmCustomer
     end
     object Saleser: TEdit
       Tag = 2
-      Left = 390
+      Left = 566
       Top = 9
       Width = 90
       Height = 20
@@ -238,7 +247,7 @@ inherited frmCustomer: TfrmCustomer
     end
     object country: TEdit
       Tag = 2
-      Left = 529
+      Left = 705
       Top = 9
       Width = 90
       Height = 20
@@ -246,6 +255,16 @@ inherited frmCustomer: TfrmCustomer
       OnChange = CoCodeChange
       OnKeyPress = CoCodeKeyPress
     end
+    object CoAbbrName: TEdit
+      Tag = 2
+      Left = 407
+      Top = 9
+      Width = 90
+      Height = 20
+      TabOrder = 4
+      OnChange = CoCodeChange
+      OnKeyPress = CoCodeKeyPress
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0

A01基础公司管理/U_Customer.pas

@@ -113,6 +113,8 @@ type
     TV3Column11: TcxGridDBColumn;
     Tv1Column11: TcxGridDBColumn;
     ADOQuery2: TADOQuery;
+    Label5: TLabel;
+    CoAbbrName: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);

A03基础价格管理/MarketValue.dpr

@@ -20,7 +20,6 @@ uses
   U_RTFun in '..\..\..\public10\ThreeFun\Fun\U_RTFun.pas',
   U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp},
   U_ClothInfoSel in '..\A00通用窗体\U_ClothInfoSel.pas' {frmClothInfoSel},
-  U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel},
   U_PictureUpload in '..\A00通用窗体\U_PictureUpload.pas' {frmPictureUpload},
   U_AttachmentUpload in '..\A00通用窗体\U_AttachmentUpload.pas' {frmAttachmentUpload},
   U_LabelMapSet in '..\A00通用窗体\U_LabelMapSet.pas' {frmLabelMapSet},
@@ -28,7 +27,9 @@ uses
   U_ClothInquiryInPut in 'U_ClothInquiryInPut.pas' {frmClothInquiryInPut},
   U_PriceFileUp in 'U_PriceFileUp.pas' {frmPriceFileUp},
   U_SLT in 'U_SLT.pas' {frmSLT: TFrame},
-  U_UserSel in '..\A00通用窗体\U_UserSel.pas' {frmUserSel};
+  U_UserSel in '..\A00通用窗体\U_UserSel.pas' {frmUserSel},
+  U_QuiryCompanySel in 'U_QuiryCompanySel.pas' {frmQuiryCompanySel},
+  U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel};
 
 {$R *.res}
 

A03基础价格管理/MarketValue.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\项目代码\骉骐\A03基础价格管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -161,10 +161,6 @@
             <Form>frmClothInfoSel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <DCCReference Include="..\A00通用窗体\U_CompanySel.pas">
-            <Form>frmCompanySel</Form>
-            <FormType>dfm</FormType>
-        </DCCReference>
         <DCCReference Include="..\A00通用窗体\U_PictureUpload.pas">
             <Form>frmPictureUpload</Form>
             <FormType>dfm</FormType>
@@ -198,6 +194,14 @@
             <Form>frmUserSel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_QuiryCompanySel.pas">
+            <Form>frmQuiryCompanySel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="..\A00通用窗体\U_CompanySel.pas">
+            <Form>frmCompanySel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

A03基础价格管理/MarketValue.dproj.local

@@ -9,14 +9,14 @@
     <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_SLT.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.067,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.444,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10Repo\项目代码\骉骐\A03基础价格管理\U_SLT.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\PictureUpload.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.695,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_UserSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.272,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=</Transaction>
@@ -34,15 +34,16 @@
     <Transaction>1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.009,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.709,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.603,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.041,=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.332,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothQuotationInPut.pas=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\U_ClothInquiryInPut.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.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.620,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理1\Contract.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.024,=D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.522,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LableMapSet.dfm</Transaction>
@@ -51,23 +52,25 @@
     <Transaction>1899-12-30 00:00:00.000.348,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.321,D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\Contract.dproj=D:\Dp10Repo\项目代码\RTBasics\A03基础价格管理\MarketValue.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.726,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesContractList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.074,D:\Dp10Repo\项目代码\RTBasics\B01基础合同管理\U_SalesConInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.519,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.425,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.520,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.575,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.441,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.569,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=</Transaction>
+    <Transaction>2025-02-08 10:16:46.590,D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\U_QuiryCompanySel.dfm=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>2025-02-08 10:16:46.590,D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\U_QuiryCompanySel.pas=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>2025-02-08 10:22:03.401,=D:\Dp10Repo\项目代码\D10myBiaoqi\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -104,8 +107,6 @@
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
     <File Path="..\A00通用窗体\U_ClothInfoSel.pas"/>
     <File Path="..\A00通用窗体\U_ClothInfoSel.dfm"/>
-    <File Path="..\A00通用窗体\U_CompanySel.pas"/>
-    <File Path="..\A00通用窗体\U_CompanySel.dfm"/>
     <File Path="..\A00通用窗体\U_LabelMapSet.pas"/>
     <File Path="..\A00通用窗体\U_LabelMapSet.dfm"/>
     <File Path="..\A00通用窗体\U_LabelPrint.pas"/>
@@ -114,6 +115,8 @@
     <File Path="..\A00通用窗体\U_PictureUpload.dfm"/>
     <File Path="..\A00通用窗体\U_UserSel.pas"/>
     <File Path="..\A00通用窗体\U_UserSel.dfm"/>
+    <File Path="..\A00通用窗体\U_CompanySel.pas"/>
+    <File Path="..\A00通用窗体\U_CompanySel.dfm"/>
     <File Path="D:\Dp10Repo"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
@@ -143,5 +146,7 @@
     <File Path="U_PriceFileUp.dfm"/>
     <File Path="U_SLT.pas"/>
     <File Path="U_SLT.dfm"/>
+    <File Path="U_QuiryCompanySel.pas"/>
+    <File Path="U_QuiryCompanySel.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

A03基础价格管理/MarketValue.skincfg

@@ -1,5 +1,5 @@
 [ExpressSkins]
-Default=0
+Default=1
 ShowNotifications=1
 Enabled=1
 dxSkinBasic=1

A03基础价格管理/ProjectGroup1.groupproj

@@ -1,8 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <ProjectGuid>{76689978-4774-4309-BBA8-DBF8D8CDBA6C}</ProjectGuid>
+        <ProjectGuid>{6ABEB7CC-9757-466A-B058-84D538D40D61}</ProjectGuid>
     </PropertyGroup>
     <ItemGroup>
+        <Projects Include="MarketValue.dproj">
+            <Dependencies/>
+        </Projects>
         <Projects Include="testDll.dproj">
             <Dependencies/>
         </Projects>
@@ -14,6 +17,15 @@
             <Default.Personality/>
         </BorlandProject>
     </ProjectExtensions>
+    <Target Name="MarketValue">
+        <MSBuild Projects="MarketValue.dproj"/>
+    </Target>
+    <Target Name="MarketValue:Clean">
+        <MSBuild Projects="MarketValue.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="MarketValue:Make">
+        <MSBuild Projects="MarketValue.dproj" Targets="Make"/>
+    </Target>
     <Target Name="testDll">
         <MSBuild Projects="testDll.dproj"/>
     </Target>
@@ -24,13 +36,13 @@
         <MSBuild Projects="testDll.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="testDll"/>
+        <CallTarget Targets="MarketValue;testDll"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="testDll:Clean"/>
+        <CallTarget Targets="MarketValue:Clean;testDll:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="testDll:Make"/>
+        <CallTarget Targets="MarketValue:Make;testDll:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

A03基础价格管理/ProjectGroup1.groupproj.local

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
+	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\testDll.dproj"/>
+		<Projects ActiveProject="D:\Dp10Repo\项目代码\D10myBiaoqi\A03基础价格管理\MarketValue.dproj"/>
 	</Default.Personality>
 </BorlandProject>

A03基础价格管理/U_ClothQuotationInPut.dfm

@@ -11,8 +11,6 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
   OldCreateOrder = True
   Position = poScreenCenter
   WindowState = wsMaximized
-  ExplicitLeft = -272
-  ExplicitTop = -45
   ExplicitWidth = 1522
   ExplicitHeight = 654
   PixelsPerInch = 96
@@ -79,8 +77,6 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
-    ExplicitLeft = -1
-    ExplicitTop = 37
     object Label3: TLabel
       Left = 41
       Top = 33
@@ -661,9 +657,9 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
         Align = alClient
         BorderStyle = cxcbsNone
         TabOrder = 1
-        ExplicitLeft = 2
         object Tv1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
           OnFocusedRecordChanged = Tv1FocusedRecordChanged
           DataController.DataSource = DS_1
           DataController.Filter.AutoDataSetFilter = True
@@ -708,6 +704,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
             Tag = 9
             Caption = #36873#25321
             DataBinding.FieldName = 'SSel'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxCheckBoxProperties'
             Properties.ImmediatePost = True
             Properties.NullStyle = nssUnchecked
@@ -717,6 +714,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object v1XHNo: TcxGridDBColumn
             Caption = #24207#21495
             DataBinding.FieldName = 'SerialNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             SortIndex = 0
             SortOrder = soAscending
@@ -726,6 +724,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object VC_SCSCode: TcxGridDBColumn
             Caption = #20135#21697#32534#21495
             DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxButtonEditProperties'
             Properties.Buttons = <
               item
@@ -740,12 +739,14 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object v1Column4: TcxGridDBColumn
             Caption = #20135#21697#21517#31216
             DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
           object Tv1Column3: TcxGridDBColumn
             Caption = #20135#21697#33521#25991#21517
             DataBinding.FieldName = 'C_EName'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxButtonEditProperties'
             Properties.Buttons = <
               item
@@ -759,36 +760,42 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object v1Column5: TcxGridDBColumn
             Caption = #35268#26684
             DataBinding.FieldName = 'C_Spec'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 60
           end
           object v1Column1: TcxGridDBColumn
             Caption = #25104#20998
             DataBinding.FieldName = 'C_Composition'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
           object Tv1Column5: TcxGridDBColumn
             Caption = #39068#33394
             DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
           object v1Column8: TcxGridDBColumn
             Caption = #33394#21495
             DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 57
           end
           object Tv1Column1: TcxGridDBColumn
             Caption = #27454#21495
             DataBinding.FieldName = 'C_StyleNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 77
           end
           object Tv1Column8: TcxGridDBColumn
             Caption = #33457#22411
             DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxButtonEditProperties'
             Properties.Buttons = <
               item
@@ -802,6 +809,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object v1Column6: TcxGridDBColumn
             Caption = #38376#24133
             DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxButtonEditProperties'
             Properties.Buttons = <
               item
@@ -816,6 +824,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object v1Column7: TcxGridDBColumn
             Caption = #20811#37325
             DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxButtonEditProperties'
             Properties.Buttons = <
               item
@@ -830,6 +839,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object v1PRTPrice: TcxGridDBColumn
             Caption = #21333#20215
             DataBinding.FieldName = 'Price'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxTextEditProperties'
             HeaderAlignmentHorz = taCenter
             Options.Sorting = False
@@ -839,6 +849,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object v1OrderUnit: TcxGridDBColumn
             Caption = #21333#20301
             DataBinding.FieldName = 'QtyUnit'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxComboBoxProperties'
             Properties.DropDownListStyle = lsEditFixedList
             Properties.Items.Strings = (
@@ -852,11 +863,13 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object Tv1Column2: TcxGridDBColumn
             Caption = #23458#25143#32534#21495
             DataBinding.FieldName = 'inputcode'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object v1Column2: TcxGridDBColumn
             Caption = #22791#27880
             DataBinding.FieldName = 'MVCSNote'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 70
           end
@@ -889,6 +902,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
         TabOrder = 0
         object TV2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
           DataController.DataSource = DS_2
           DataController.Filter.AutoDataSetFilter = True
           DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -916,6 +930,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object TV2Column4: TcxGridDBColumn
             Caption = #23458#25143
             DataBinding.FieldName = 'BuyName'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -923,6 +938,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object TV2Column2: TcxGridDBColumn
             Caption = #21333#20215
             DataBinding.FieldName = 'Price'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 50
@@ -930,11 +946,13 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object TV2Column8: TcxGridDBColumn
             Caption = #26159#21542#21547#31246
             DataBinding.FieldName = 'IsTax'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column1: TcxGridDBColumn
             Caption = #20135#21697#32534#21495
             DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 78
@@ -942,6 +960,7 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object TV2Column3: TcxGridDBColumn
             Caption = #25253#20215#26085#26399
             DataBinding.FieldName = 'MVCDate'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 84
@@ -949,16 +968,19 @@ inherited frmClothQuotationInPut: TfrmClothQuotationInPut
           object TV2Column5: TcxGridDBColumn
             Caption = #21333#20301
             DataBinding.FieldName = 'QtyUnit'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column6: TcxGridDBColumn
             Caption = #19994#21153#21592
             DataBinding.FieldName = 'Saleser'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column7: TcxGridDBColumn
             Caption = #20215#26684#26415#35821
             DataBinding.FieldName = 'jiagesy'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 94
           end

A03基础价格管理/U_ClothQuotationInPut.pas

@@ -14,7 +14,23 @@ uses
   dxDateRanges, dxBarBuiltInMenu, dxDateTimeWheelPicker, dxGDIPlusClasses,
   Vcl.Menus, MovePanel, cxCheckBox, cxImage, cxDBEdit, Vcl.DBCtrls, U_BaseInput,
   System.ImageList, Vcl.ImgList, IdBaseComponent, IdComponent, IdTCPConnection,
-  IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI, cxSplitter;
+  IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI, cxSplitter,
+  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
   TfrmClothQuotationInPut = class(TfrmBaseInput)
@@ -163,8 +179,8 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel
+  U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_ClothInfoSel,
-  , U_ClothInfoSel, U_PictureUpload, U_UserSel;
+  U_PictureUpload, U_UserSel ,U_QuiryCompanySel;
 
 {$R *.dfm}
 procedure TfrmClothQuotationInPut.InitHistoricalPrice();
@@ -627,23 +643,23 @@ end;
 procedure TfrmClothQuotationInPut.BuyNameBtnUpClick(Sender: TObject);
 begin
   try
-    frmCompanySel := TfrmCompanySel.Create(Application);
+    frmQuiryCompanySel := TfrmQuiryCompanySel.Create(Application);
-    with frmCompanySel do
+    with frmQuiryCompanySel do
     begin
       FCoType := '¿Í»§';
       if Self.FAuthority = '¼Èë' then
         FAuthority := 'Àíµ¥ÒµÎñ';
       if ShowModal = 1 then
       begin
-        self.BuyName.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
+        self.BuyName.TxtCode := Trim(frmQuiryCompanySel.CDS_1.fieldbyname('CoCode').AsString);
-        self.BuyName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString);
+        self.BuyName.Text := Trim(frmQuiryCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString);
-        self.SalesId.Text := Trim(frmCompanySel.CDS_1.fieldbyname('SalesId').AsString);
+        self.SalesId.Text := Trim(frmQuiryCompanySel.CDS_1.fieldbyname('SalesId').AsString);
-        self.Saleser.Text := Trim(frmCompanySel.CDS_1.fieldbyname('Saleser').AsString);
+        self.Saleser.Text := Trim(frmQuiryCompanySel.CDS_1.fieldbyname('Saleser').AsString);
       end;
     end;
 
   finally
-    frmCompanySel.Free;
+    frmQuiryCompanySel.Free;
   end;
 
 end;

A03基础价格管理/U_ClothQuotationList.dfm

@@ -179,8 +179,11 @@ inherited frmClothQuotationList: TfrmClothQuotationList
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
+    ExplicitLeft = -3
+    ExplicitTop = 123
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       OnCustomDrawCell = Tv1CustomDrawCell
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
@@ -208,6 +211,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column4: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         Properties.NullStyle = nssUnchecked
@@ -218,6 +222,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1OrdDate: TcxGridDBColumn
         Caption = #25253#20215#26085#26399
         DataBinding.FieldName = 'MVCDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -229,6 +234,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1DeliveryDate: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxDateEditProperties'
         Properties.ShowTime = False
         HeaderAlignmentHorz = taCenter
@@ -240,6 +246,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1ConNo: TcxGridDBColumn
         Caption = #25253#20215#21333#21495
         DataBinding.FieldName = 'MVCNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -249,6 +256,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column1: TcxGridDBColumn
         Caption = #25105#26041#21333#20301
         DataBinding.FieldName = 'SellName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -258,6 +266,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1CustomerNoName: TcxGridDBColumn
         Caption = #23458#25143
         DataBinding.FieldName = 'BuyName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -267,11 +276,13 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object Tv1Column1: TcxGridDBColumn
         Caption = #38468#20214
         DataBinding.FieldName = 'IsFJ'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
       object Tv1Column19: TcxGridDBColumn
         Caption = #20132#26399#35828#26126
         DataBinding.FieldName = 'ShippMent'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 271
@@ -279,6 +290,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column9: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'note'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -286,6 +298,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object Tv1Column14: TcxGridDBColumn
         Caption = #20215#26684#26415#35821
         DataBinding.FieldName = 'JiaGeSY'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -293,6 +306,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object Tv1Column7: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -300,6 +314,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column8: TcxGridDBColumn
         Caption = #23458#25143#21333#21495
         DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 86
@@ -307,6 +322,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1OrdPerson1: TcxGridDBColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -315,6 +331,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       end
       object v1Column10: TcxGridDBColumn
         DataBinding.FieldName = 'status'
+        DataBinding.IsNullValueType = True
         Visible = False
         Options.Editing = False
         VisibleForCustomization = False
@@ -322,6 +339,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column13: TcxGridDBColumn
         Caption = #21046#21333#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -329,12 +347,14 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object Tv1Column2: TcxGridDBColumn
         Caption = #26159#21542#21547#31246
         DataBinding.FieldName = 'IsTax'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
       end
       object Tv1Column3: TcxGridDBColumn
         Caption = #36215#36816#28207
         DataBinding.FieldName = 'QiYun'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -342,6 +362,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object Tv1Column4: TcxGridDBColumn
         Caption = #30446#30340#28207
         DataBinding.FieldName = 'MuDi'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
@@ -518,7 +539,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
     TabOrder = 2
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
-    Properties.TabIndex = 4
+    Properties.TabIndex = 2
     Properties.Tabs.Strings = (
       #26410#25552#20132
       #24050#25552#20132
@@ -548,6 +569,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
     TabOrder = 5
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_2
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -590,6 +612,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1XHNo: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         SortIndex = 0
@@ -600,6 +623,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object VC_SCSCode: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -614,6 +638,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object cxGridDBColumn2: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -621,6 +646,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object cxGridDBColumn3: TcxGridDBColumn
         Caption = #20135#21697#33521#25991#21517
         DataBinding.FieldName = 'C_EName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -635,6 +661,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column5: TcxGridDBColumn
         Caption = #35268#26684
         DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 60
@@ -642,6 +669,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object cxGridDBColumn4: TcxGridDBColumn
         Caption = #25104#20998
         DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -649,6 +677,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object cxGridDBColumn5: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -656,6 +685,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object cxGridDBColumn6: TcxGridDBColumn
         Caption = #33394#21495
         DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 57
@@ -663,6 +693,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object cxGridDBColumn7: TcxGridDBColumn
         Caption = #27454#21495
         DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 77
@@ -670,6 +701,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object cxGridDBColumn8: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -684,6 +716,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column6: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -697,6 +730,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column7: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -710,6 +744,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1OrderUnit: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsEditFixedList
         Properties.Items.Strings = (
@@ -724,6 +759,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1PRTPrice: TcxGridDBColumn
         Caption = #21333#20215
         DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -734,6 +770,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object v1Column2: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'MVCSNote'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
@@ -741,6 +778,7 @@ inherited frmClothQuotationList: TfrmClothQuotationList
       object TV2Column1: TcxGridDBColumn
         Caption = #23458#25143#32534#21495
         DataBinding.FieldName = 'inputcode'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 82
       end

A03基础价格管理/U_ClothQuotationList.pas

@@ -12,7 +12,23 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
   dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
-  U_BaseList, RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, Vcl.Clipbrd, jpeg, U_Slt;
+  U_BaseList, RM_e_Graphic, RM_e_Jpeg, RM_E_llPDF, Vcl.Clipbrd, jpeg, U_Slt,
+  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;
 
 var
   Mach: array of TfrmSlt;
@@ -322,12 +338,12 @@ begin
         end;
       1:
         begin
-          tbedit.Enabled := True;
+//          tbedit.Enabled := True;
           btnCXTijiao.Enabled := True;
         end;
       2:
         begin
-          tbedit.Enabled := True;
+//          tbedit.Enabled := True;
 
         end;
       3:
@@ -350,13 +366,13 @@ begin
         end;
       1:
         begin
-          tbedit.Enabled := True;
+//          tbedit.Enabled := True;
           btnCXTijiao.Enabled := True;
           tchk.Enabled := True;
         end;
       2:
         begin
-          tbedit.Enabled := True;
+//          tbedit.Enabled := True;
           tnochk.Enabled := True;
 
         end;
@@ -503,11 +519,14 @@ begin
     Exit;
 //  ShowMessage(Trim(CDS_1.fieldbyname('Filler').AsString));
 //  ShowMessage(Trim(DName));
+  if Trim(FAuthority) <> '¹ÜÀí' then
+  begin
     if Trim(CDS_1.fieldbyname('Filler').AsString) <> Trim(DName) then
     begin
       Application.MessageBox('不能操作他人的数据!', '提示', 0);
       Exit;
     end;
+  end;
   try
     frmClothQuotationInPut := TfrmClothQuotationInPut.Create(Application);
     with frmClothQuotationInPut do

A03基础价格管理/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)

A03基础价格管理/U_GetDllForm.pas

@@ -75,7 +75,7 @@ begin
     pswd := 'rightsoft@5740';
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-//    Parameters1 := '¼Èë';
+    Parameters1 := '¼Èë';
     Parameters1 := '¹ÜÀí';
 //    DCode :='002';
 //    DName :='SELINAÁõ';

A03基础价格管理/U_QuiryCompanySel.pas

@@ -0,0 +1,213 @@
+unit U_QuiryCompanySel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, ToolWin, ComCtrls, U_BaseHelp, cxGridCustomTableView,
+  cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
+  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
+  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, dxSkinWXI,
+  dxScrollbarAnnotations, 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,
+  dxSkinXmas2008Blue;
+
+type
+  TfrmQuiryCompanySel = class(TfrmBaseHelp)
+    TV1: TcxGridDBTableView;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid1: TcxGrid;
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    TBSave: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    ADOConnection1: TADOConnection;
+    Panel1: TPanel;
+    Label1: TLabel;
+    CoName: TEdit;
+    GPM_1: TcxGridPopupMenu;
+    ImageList1: TImageList;
+    TV1Column1: TcxGridDBColumn;
+    TV1Column2: TcxGridDBColumn;
+    TV1Column3: TcxGridDBColumn;
+    ThreeColorBase: TcxStyleRepository;
+    SHuangSe: TcxStyle;
+    SkyBlue: TcxStyle;
+    Default: TcxStyle;
+    QHuangSe: TcxStyle;
+    Red: TcxStyle;
+    FontBlue: TcxStyle;
+    TextSHuangSe: TcxStyle;
+    FonePurple: TcxStyle;
+    FoneClMaroon: TcxStyle;
+    FoneRed: TcxStyle;
+    RowColor: TcxStyle;
+    handBlack: TcxStyle;
+    cxBlue: TcxStyle;
+    SHuangSeCu: TcxStyle;
+    TV1Column4: TcxGridDBColumn;
+    Label2: TLabel;
+    CoBusinessType: TEdit;
+    Label3: TLabel;
+    CoAbbrName: TEdit;
+    Label4: TLabel;
+    CoCode: TEdit;
+    procedure FormCreate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure TBSaveClick(Sender: TObject);
+    procedure TV1DblClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure CoNameChange(Sender: TObject);
+  private
+    procedure InitGrid();
+    { Private declarations }
+  public
+    FCoType, FAuthority: string;
+    { Public declarations }
+  end;
+
+var
+  frmQuiryCompanySel: TfrmQuiryCompanySel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmQuiryCompanySel.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 TfrmQuiryCompanySel.CoNameChange(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 TfrmQuiryCompanySel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+
+  CoName.SetFocus;
+
+  Action := cahide;
+end;
+
+procedure TfrmQuiryCompanySel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select A.*,B.Contacts from BS_Company A left join Bs_Company_contact B on A.CoId=B.CoID ');
+      sql.Add('where   Valid =''Y''');
+      if Trim(FCoType) <> '我司' then
+      begin
+        sql.Add(' and isnull(B.IsDefault,1)=1');
+      end;
+      if Trim(FCoType) <> '' then
+      begin
+        sql.Add(' and A.CoType=''' + Trim(FCoType) + '''');
+      end;
+      if Trim(FAuthority) = '理单业务' then
+      begin
+        sql.Add(' and ( SalesId=' + quotedstr(trim(DCode)) + ' or exists (select * from [dbo].[F_Tool_SplitString](TallyId,'','') X where X.RTValue =' + quotedstr(trim(DCode)) + '))');
+      end;
+//      ShowMessage(sql.text);
+      Open;
+    end;
+
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmQuiryCompanySel.FormShow(Sender: TObject);
+begin
+  inherited;
+
+  InitGrid();
+
+  ReadCxGrid('单位名称' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmQuiryCompanySel.TBCloseClick(Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfrmQuiryCompanySel.TBSaveClick(Sender: TObject);
+begin
+  WriteCxGrid('单位名称' + Trim(FCoType), TV1, '自定义数据');
+
+end;
+
+procedure TfrmQuiryCompanySel.ToolButton1Click(Sender: TObject);
+begin
+  CoName.SetFocus;
+  ModalResult := 1;
+end;
+
+procedure TfrmQuiryCompanySel.TV1DblClick(Sender: TObject);
+begin
+  ModalResult := 1;
+end;
+
+procedure TfrmQuiryCompanySel.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmQuiryCompanySel := nil;
+end;
+
+end.
+

A03基础价格管理/testDll.dproj

@@ -95,7 +95,7 @@
         <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <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>
@@ -139,6 +139,7 @@
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <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\项目代码\D10myBiaoqi\A03基础价格管理\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

A03基础价格管理/testDll.skincfg

@@ -0,0 +1,62 @@
+[ExpressSkins]
+Default=1
+ShowNotifications=1
+Enabled=1
+dxSkinBasic=1
+dxSkinBlack=1
+dxSkinBlue=1
+dxSkinBlueprint=1
+dxSkinCaramel=1
+dxSkinCoffee=1
+dxSkinDarkroom=1
+dxSkinDarkSide=1
+dxSkinDevExpressDarkStyle=1
+dxSkinDevExpressStyle=1
+dxSkinFoggy=1
+dxSkinGlassOceans=1
+dxSkinHighContrast=1
+dxSkiniMaginary=1
+dxSkinLilian=1
+dxSkinLiquidSky=1
+dxSkinLondonLiquidSky=1
+dxSkinMcSkin=1
+dxSkinMetropolis=1
+dxSkinMetropolisDark=1
+dxSkinMoneyTwins=1
+dxSkinOffice2007Black=1
+dxSkinOffice2007Blue=1
+dxSkinOffice2007Green=1
+dxSkinOffice2007Pink=1
+dxSkinOffice2007Silver=1
+dxSkinOffice2010Black=1
+dxSkinOffice2010Blue=1
+dxSkinOffice2010Silver=1
+dxSkinOffice2013DarkGray=1
+dxSkinOffice2013LightGray=1
+dxSkinOffice2013White=1
+dxSkinOffice2016Colorful=1
+dxSkinOffice2016Dark=1
+dxSkinOffice2019Black=1
+dxSkinOffice2019Colorful=1
+dxSkinOffice2019DarkGray=1
+dxSkinOffice2019White=1
+dxSkinPumpkin=1
+dxSkinSeven=1
+dxSkinSevenClassic=1
+dxSkinSharp=1
+dxSkinSharpPlus=1
+dxSkinSilver=1
+dxSkinSpringtime=1
+dxSkinStardust=1
+dxSkinSummer2008=1
+dxSkinTheAsphaltWorld=1
+dxSkinTheBezier=1
+dxSkinsDefaultPainters=1
+dxSkinValentine=1
+dxSkinVisualStudio2013Blue=1
+dxSkinVisualStudio2013Dark=1
+dxSkinVisualStudio2013Light=1
+dxSkinVS2010=1
+dxSkinWhiteprint=1
+dxSkinWXI=1
+dxSkinXmas2008Blue=1

A09财务通用管理/U_CustStatement.dfm

@@ -362,7 +362,7 @@ inherited frmCustStatement: TfrmCustStatement
     TabOrder = 3
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 2
-    Properties.TabIndex = 0
+    Properties.TabIndex = 1
     Properties.Tabs.Strings = (
       '        USD          '
       '        CNY            ')

A09财务通用管理/U_CustStatement.pas

@@ -214,6 +214,7 @@ begin
       enddate.DateTime := self.Enddate.DateTime;
       OppCoName.Text := self.CDS_HZ.fieldbyname('OppCoName').AsString;
       FOppCoNo := self.CDS_HZ.fieldbyname('OppCoNo').AsString;
+      FOurCoNo := self.CDS_HZ.fieldbyname('OurCoNo').AsString;
       FZKType := Self.FZKType;
       case cxTabControl1.TabIndex of
         0:

A09财务通用管理/U_SingleCustStatement.dfm

@@ -768,6 +768,13 @@ object frmSingleCustStatement: TfrmSingleCustStatement
         HeaderAlignmentHorz = taCenter
         Width = 74
       end
+      object TV11Column5: TcxGridDBColumn
+        Caption = #25105#26041#21333#20301
+        DataBinding.FieldName = 'OurCoName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 69
+      end
       object Tv1Column6: TcxGridDBColumn
         Caption = #25688#35201
         DataBinding.FieldName = 'FFAbstract'
@@ -866,6 +873,9 @@ object frmSingleCustStatement: TfrmSingleCustStatement
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
+      object TV11Column4: TcxGridDBColumn
+        DataBinding.IsNullValueType = True
+      end
     end
     object cxGridLevel2: TcxGridLevel
       GridView = TV11

A09财务通用管理/U_SingleCustStatement.pas

@@ -108,6 +108,8 @@ type
     TV11Column1: TcxGridDBColumn;
     TV11Column2: TcxGridDBColumn;
     TV11Column3: TcxGridDBColumn;
+    TV11Column4: TcxGridDBColumn;
+    TV11Column5: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -124,7 +126,7 @@ type
     procedure InitGrid();
   public
     { Public declarations }
-    FOppCoNo, FCurrency: string;
+    FOppCoNo, FOurCoNo, FCurrency: string;
   end;
 
 var
@@ -149,6 +151,7 @@ begin
     sql.Add('  @Begdate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime))));
     sql.Add(' ,@Enddate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1))));
     sql.Add(' ,@OppCoNo=' + QuotedStr(Trim(FOppCoNo)));
+    sql.Add(' ,@OurCoNo=' + QuotedStr(Trim(FOurCoNo)));
     sql.Add(' ,@Currency=' + QuotedStr(Trim(FCurrency)));
 //    showmessage(sql.text);
     Open;

B01基础合同管理/U_BaoguanList.pas

@@ -1006,11 +1006,11 @@ var
 begin
   if CDS_1.IsEmpty then
     exit;
-  if CDS_1.FieldByName('ISFJ').AsBoolean = False then
+//  if CDS_1.FieldByName('ISFJ').AsBoolean = False then
-  begin
+//  begin
-    application.MessageBox('请上传附件后完成合同', '提示');
+//    application.MessageBox('请上传附件后完成合同', '提示');
-    Exit;
+//    Exit;
-  end;
+//  end;
   if not CDS_1.Locate('SSel', True, []) then
   begin
     application.MessageBox('请选择数据', '提示');

B01基础合同管理/U_ContractList.dfm

@@ -6,6 +6,7 @@ inherited frmContractList: TfrmContractList
   ClientWidth = 1525
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -383
   ExplicitWidth = 1541
   ExplicitHeight = 775
   PixelsPerInch = 96
@@ -210,12 +211,14 @@ inherited frmContractList: TfrmContractList
   end
   object cxGrid1: TcxGrid [1]
     Left = 0
-    Top = 159
+    Top = 181
     Width = 1525
-    Height = 305
+    Height = 283
     Align = alClient
     PopupMenu = pm1
     TabOrder = 3
+    ExplicitTop = 161
+    ExplicitHeight = 305
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -232,6 +235,22 @@ inherited frmContractList: TfrmContractList
         end
         item
           Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column28
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column29
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column30
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column31
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -551,6 +570,26 @@ inherited frmContractList: TfrmContractList
         HeaderAlignmentHorz = taCenter
         Width = 59
       end
+      object Tv1Column28: TcxGridDBColumn
+        DataBinding.FieldName = 'HZMQty'
+        DataBinding.IsNullValueType = True
+        Visible = False
+      end
+      object Tv1Column29: TcxGridDBColumn
+        DataBinding.FieldName = 'HZKg'
+        DataBinding.IsNullValueType = True
+        Visible = False
+      end
+      object Tv1Column30: TcxGridDBColumn
+        DataBinding.FieldName = 'CNYAmount'
+        DataBinding.IsNullValueType = True
+        Visible = False
+      end
+      object Tv1Column31: TcxGridDBColumn
+        DataBinding.FieldName = 'USDAmount'
+        DataBinding.IsNullValueType = True
+        Visible = False
+      end
       object Tv1Column23: TcxGridDBColumn
         Caption = #39044#20272#25104#26412#35814#24773
         DataBinding.FieldName = 'EstimatedCD'
@@ -567,16 +606,17 @@ inherited frmContractList: TfrmContractList
     Left = 0
     Top = 76
     Width = 1525
-    Height = 61
+    Height = 83
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = 16242829
     ParentBackground = False
     TabOrder = 1
+    ExplicitTop = 82
     object Label4: TLabel
-      Left = 621
+      Left = 435
-      Top = 23
+      Top = 18
       Width = 40
       Height = 12
       Caption = #23458'  '#25143
@@ -588,8 +628,8 @@ inherited frmContractList: TfrmContractList
       ParentFont = False
     end
     object Label5: TLabel
-      Left = 926
+      Left = 435
-      Top = 23
+      Top = 52
       Width = 52
       Height = 12
       Caption = #20135#21697#21517#31216
@@ -615,7 +655,7 @@ inherited frmContractList: TfrmContractList
     end
     object Label9: TLabel
       Left = 306
-      Top = 23
+      Top = 18
       Width = 39
       Height = 12
       Caption = #21512#21516#21495
@@ -654,14 +694,14 @@ inherited frmContractList: TfrmContractList
     end
     object Label2: TLabel
       Left = 194
-      Top = 23
+      Top = 18
       Width = 6
       Height = 12
       Caption = '-'
     end
     object Label3: TLabel
-      Left = 453
+      Left = 293
-      Top = 23
+      Top = 52
       Width = 52
       Height = 12
       Caption = #23458#25143#21333#21495
@@ -673,8 +713,8 @@ inherited frmContractList: TfrmContractList
       ParentFont = False
     end
     object Label6: TLabel
-      Left = 1094
+      Left = 593
-      Top = 23
+      Top = 52
       Width = 65
       Height = 12
       Caption = #20135#21697#33521#25991#21517
@@ -687,8 +727,8 @@ inherited frmContractList: TfrmContractList
       Visible = False
     end
     object Label7: TLabel
-      Left = 772
+      Left = 599
-      Top = 23
+      Top = 18
       Width = 39
       Height = 12
       Caption = #20013#38388#21830
@@ -699,9 +739,21 @@ inherited frmContractList: TfrmContractList
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label1: TLabel
+      Left = 784
+      Top = 24
+      Width = 9
+      Height = 16
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BegDate: TDateTimePicker
       Left = 111
-      Top = 19
+      Top = 14
       Width = 85
       Height = 20
       Date = 40675.000000000000000000
@@ -711,7 +763,7 @@ inherited frmContractList: TfrmContractList
     end
     object EndDate: TDateTimePicker
       Left = 202
-      Top = 19
+      Top = 14
       Width = 86
       Height = 20
       Date = 40675.000000000000000000
@@ -721,8 +773,8 @@ inherited frmContractList: TfrmContractList
     end
     object BuyName: TEdit
       Tag = 2
-      Left = 664
+      Left = 491
-      Top = 19
+      Top = 14
       Width = 78
       Height = 20
       TabOrder = 2
@@ -730,8 +782,8 @@ inherited frmContractList: TfrmContractList
     end
     object C_Name: TEdit
       Tag = 2
-      Left = 982
+      Left = 491
-      Top = 18
+      Top = 48
       Width = 76
       Height = 20
       TabOrder = 3
@@ -749,7 +801,7 @@ inherited frmContractList: TfrmContractList
     object ConNo: TEdit
       Tag = 2
       Left = 347
-      Top = 19
+      Top = 14
       Width = 77
       Height = 20
       TabOrder = 4
@@ -775,8 +827,8 @@ inherited frmContractList: TfrmContractList
     end
     object BuyConNo: TEdit
       Tag = 2
-      Left = 508
+      Left = 347
-      Top = 21
+      Top = 48
       Width = 77
       Height = 20
       TabOrder = 5
@@ -784,8 +836,8 @@ inherited frmContractList: TfrmContractList
     end
     object HZSCSEName: TEdit
       Tag = 2
-      Left = 1165
+      Left = 664
-      Top = 19
+      Top = 48
       Width = 76
       Height = 20
       TabOrder = 9
@@ -795,8 +847,8 @@ inherited frmContractList: TfrmContractList
     end
     object MiddleName: TEdit
       Tag = 2
-      Left = 814
+      Left = 641
-      Top = 19
+      Top = 14
       Width = 78
       Height = 20
       TabOrder = 10
@@ -804,7 +856,7 @@ inherited frmContractList: TfrmContractList
     end
     object IsJYTime: TCheckBox
       Left = 31
-      Top = 20
+      Top = 15
       Width = 74
       Height = 17
       Caption = #19979#21333#26085#26399
@@ -821,7 +873,7 @@ inherited frmContractList: TfrmContractList
   end
   object cxTabControl1: TcxTabControl [3]
     Left = 0
-    Top = 137
+    Top = 159
     Width = 1525
     Height = 22
     Align = alTop
@@ -837,6 +889,7 @@ inherited frmContractList: TfrmContractList
       #24050#21462#28040
       #20840#37096)
     OnChange = cxTabControl1Change
+    ExplicitTop = 137
     ClientRectBottom = 22
     ClientRectRight = 1525
     ClientRectTop = 19

B01基础合同管理/U_ContractList.pas

@@ -146,6 +146,11 @@ type
     ToolButton4: TToolButton;
     Tv1Column24: TcxGridDBColumn;
     Tv1Column26: TcxGridDBColumn;
+    Tv1Column28: TcxGridDBColumn;
+    Tv1Column29: TcxGridDBColumn;
+    Tv1Column30: TcxGridDBColumn;
+    Tv1Column31: TcxGridDBColumn;
+    Label1: TLabel;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -444,6 +449,7 @@ end;
 procedure TfrmContractList.InitGrid();
 var
   WSql: string;
+  FZMQty,FZKg,FUSDAmount,FCNYAmount: Double;
 begin
   WSql := SGetFilters(Panel1, 1, 2);
   if trim(WSql) <> '' then
@@ -478,10 +484,12 @@ begin
       sql.Add('where FF.TFType = ''ºÏͬ'' and FF.WBID=AA.ConMID)=0 then 0 else 1 end) as bit )   ');
       SQL.Add(',STUFF( (SELECT  '';'' +X.CB_Name+X.CB_Price FROM Bs_Contract_Sub_CB X ');
       sql.Add('where X.ConSid= B.ConSid ORDER BY X.SerialNo  FOR XML PATH('''')),1, 1, '''') AS EstimatedCD  ');
-      sql.Add(',AA.*,B.* from (select A.*   ');
+      sql.Add(',Cast((Case ConUnit when ''M'' then B.ConQty when ''Y'' then B.ConQty*0.9144 else 0 end ) AS DECIMAL(18,2)) AS HZMQty');
-      sql.Add(',(Case A.Status when ''0'' then ''未提交'' when ''1'' then ''已提交''');
+      sql.Add(',Cast((Case ConUnit when ''Kg'' then B.ConQty  else 0 end ) AS DECIMAL(18,2)) AS HZKg');
-      sql.Add('when ''9'' then ''已审核'' when ''10'' then ''已完成'' ');
+      sql.Add(',Cast((Case Currency when ''CNY'' then B.ConTotalAmount  else 0 end ) AS DECIMAL(18,2)) AS CNYAmount');
-      SQL.Add('when ''-1'' then ''已取消'' end) AS ZT');
+      sql.Add(',Cast((Case Currency when ''USD'' then B.ConTotalAmount  else 0 end ) AS DECIMAL(18,2)) AS USDAmount');
+      sql.Add(',AA.*,B.* from (select A.*,(Case A.Status when ''0'' then ''未提交'' when ''1'' then ''已提交''');
+      sql.Add('when ''9'' then ''已审核'' when ''10'' then ''已完成'' when ''-1'' then ''已取消'' end) AS ZT');
       sql.Add('from BS_Contract_Main A  ) AA left join BS_Contract_Sub B on AA.ConMid=B.ConMid');
       sql.Add('where 1=1 ' + (WSql));
       sql.Add(' and AA.ConType in (''ÄÚÏú'',''ÍâÏú'') ');
@@ -523,6 +531,16 @@ begin
     TV1.DataController.Filter.Clear;
 
   end;
+
+   if ADOQueryMain.IsEmpty = False then
+  begin
+    FZMQty := tv1.DataController.Summary.FooterSummaryValues[2];
+    FZKg := tv1.DataController.Summary.FooterSummaryValues[3];
+    FCNYAmount := tv1.DataController.Summary.FooterSummaryValues[4];
+    FUSDAmount := tv1.DataController.Summary.FooterSummaryValues[5];
+
+    Label1.Caption := '总米数：' + FloatToStr(FZMQty) + '    总公斤数：' + FloattoStr(FZKg) + '    CNY金额：' + FloattoStr(FCNYAmount)+ '    USD金额：' + FloattoStr(FUSDAmount);
+  end;
 end;
 
 procedure TfrmContractList.TBFindClick(Sender: TObject);

T01贸易生产计划/U_GetDllForm.pas

@@ -77,7 +77,7 @@ begin
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //    Parameters1 := '¼Èë';
-//    Parameters2 := '理单';
+//    Parameters2 := '业务';
     Parameters1 := '¹ÜÀí';
 //    DName:='ADMIN';
   end
@@ -164,7 +164,6 @@ begin
         end;
       end;
 
-
     211:  //Éú²ú½ø¶È²éѯ
       begin
         with TfrmTradePlanSchedule.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
@@ -189,7 +188,6 @@ begin
         end;
       end;
 
-
     10000:
       begin
         for i := 0 to application.MainForm.MDIChildCount - 1 do

T01贸易生产计划/U_TradePlanList.dfm

@@ -7,7 +7,7 @@ inherited frmTradePlanList: TfrmTradePlanList
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitTop = -214
+  ExplicitLeft = -185
   ExplicitWidth = 1556
   ExplicitHeight = 799
   PixelsPerInch = 96
@@ -224,13 +224,14 @@ inherited frmTradePlanList: TfrmTradePlanList
     Left = 0
     Top = 76
     Width = 1540
-    Height = 51
+    Height = 77
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = 16242829
     ParentBackground = False
     TabOrder = 1
+    ExplicitTop = 70
     object Label3: TLabel
       Left = 345
       Top = 20
@@ -258,8 +259,8 @@ inherited frmTradePlanList: TfrmTradePlanList
       ParentFont = False
     end
     object Label1: TLabel
-      Left = 665
+      Left = 368
-      Top = 20
+      Top = 50
       Width = 26
       Height = 12
       Caption = #23458#25143
@@ -271,7 +272,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       ParentFont = False
     end
     object Label2: TLabel
-      Left = 506
+      Left = 651
       Top = 20
       Width = 52
       Height = 12
@@ -284,8 +285,8 @@ inherited frmTradePlanList: TfrmTradePlanList
       ParentFont = False
     end
     object Label4: TLabel
-      Left = 813
+      Left = 496
-      Top = 21
+      Top = 50
       Width = 52
       Height = 12
       Caption = #23458#25143#21333#21495
@@ -297,7 +298,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       ParentFont = False
     end
     object Label5: TLabel
-      Left = 977
+      Left = 993
       Top = 12
       Width = 11
       Height = 19
@@ -308,6 +309,19 @@ inherited frmTradePlanList: TfrmTradePlanList
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label25: TLabel
+      Left = 509
+      Top = 21
+      Width = 39
+      Height = 12
+      Caption = #21512#21516#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BegDate: TDateTimePicker
       Left = 128
       Top = 16
@@ -360,8 +374,8 @@ inherited frmTradePlanList: TfrmTradePlanList
     end
     object CustName: TEdit
       Tag = 2
-      Left = 697
+      Left = 400
-      Top = 16
+      Top = 46
       Width = 80
       Height = 20
       TabOrder = 5
@@ -369,7 +383,7 @@ inherited frmTradePlanList: TfrmTradePlanList
     end
     object C_Name: TEdit
       Tag = 2
-      Left = 561
+      Left = 706
       Top = 16
       Width = 77
       Height = 20
@@ -378,8 +392,8 @@ inherited frmTradePlanList: TfrmTradePlanList
     end
     object BuyConNo: TEdit
       Tag = 2
-      Left = 869
+      Left = 554
-      Top = 17
+      Top = 46
       Width = 80
       Height = 20
       TabOrder = 7
@@ -394,15 +408,26 @@ inherited frmTradePlanList: TfrmTradePlanList
       State = cbChecked
       TabOrder = 8
     end
+    object ConNo: TEdit
+      Tag = 2
+      Left = 554
+      Top = 17
+      Width = 77
+      Height = 20
+      TabOrder = 9
+      OnKeyPress = OrderNoKeyPress
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0
-    Top = 145
+    Top = 171
     Width = 1540
-    Height = 411
+    Height = 385
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 3
+    ExplicitTop = 145
+    ExplicitHeight = 411
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -683,7 +708,7 @@ inherited frmTradePlanList: TfrmTradePlanList
   end
   object cxTabControl1: TcxTabControl [4]
     Left = 0
-    Top = 127
+    Top = 153
     Width = 1540
     Height = 18
     Align = alTop
@@ -700,6 +725,7 @@ inherited frmTradePlanList: TfrmTradePlanList
       '  '#24050#23436#25104'  '
       '  '#20840#37096'   ')
     OnChange = cxTabControl1Change
+    ExplicitTop = 127
     ClientRectRight = 0
     ClientRectTop = 0
   end
@@ -1517,7 +1543,6 @@ inherited frmTradePlanList: TfrmTradePlanList
       ParentFont = False
       TabOrder = 0
       Zoom = 100
-      ExplicitHeight = 663
     end
     object BGComposition: TEdit
       Tag = 2

T01贸易生产计划/U_TradePlanList.pas

@@ -204,6 +204,8 @@ type
     Tv1Column25: TcxGridDBColumn;
     BGNote: TMemo;
     Label24: TLabel;
+    Label25: TLabel;
+    ConNo: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);

T01贸易生产计划/U_TradePlanSchedule.dfm

@@ -6,6 +6,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
   ClientWidth = 1540
   Position = poScreenCenter
   WindowState = wsMaximized
+  ExplicitLeft = -398
   ExplicitWidth = 1556
   ExplicitHeight = 663
   PixelsPerInch = 96
@@ -703,6 +704,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'RZAPS'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Styles.Header = DataLink_TradePlan.FontBlue
         Position.BandIndex = 2
         Position.ColIndex = 0
         Position.RowIndex = 0
@@ -781,6 +783,7 @@ inherited frmTradePlanSchedule: TfrmTradePlanSchedule
         DataBinding.FieldName = 'CGAPS'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Styles.Header = DataLink_TradePlan.FontBlue
         Width = 58
         Position.BandIndex = 1
         Position.ColIndex = 0

T01贸易生产计划/U_TradePlanSchedule.pas

@@ -143,7 +143,7 @@ type
   public
     { Public declarations }
     RKFlag, FCYID, FZKType, FBZType: string;
-    fType: string;
+    fType,Canshu2: string;
   end;
 
 var
@@ -176,6 +176,9 @@ begin
       sql.Add(' exec  P_Trade_Plan_Schedule_1  ');
       sql.Add('  @begdate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', begdate.DateTime))));
       sql.Add(' ,@Enddate=' + QuotedStr(Trim(FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1))));
+      if canshu2='业务' then
+      sql.Add(' ,@Saleser=' + QuotedStr(Trim(DName)));
+
       case cxTabControl1.TabIndex of
         0:
           begin
@@ -262,6 +265,7 @@ procedure TfrmTradePlanSchedule.FormShow(Sender: TObject);
 begin
   inherited;
   readCxBandedGrid(self.Caption + '3', Tv1, '½ø¶Èͳ¼Æ²éѯ');
+  canshu2 := self.fParameters2;
   InitGrid();
 end;
 

T02贸易汇总仓库/U_TradeSampleClothStkList.dfm

@@ -76,10 +76,9 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    ExplicitLeft = -1
     ExplicitTop = 34
     object Label3: TLabel
-      Left = 227
+      Left = 207
       Top = 11
       Width = 24
       Height = 12
@@ -93,30 +92,37 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList
       Caption = #26469#33258#21333#20301
     end
     object Label8: TLabel
-      Left = 369
+      Left = 486
       Top = 11
       Width = 24
       Height = 12
       Caption = #35268#26684
     end
     object Label2: TLabel
-      Left = 507
+      Left = 624
       Top = 11
       Width = 36
       Height = 12
       Caption = #25209'  '#21495
     end
     object Label1: TLabel
-      Left = 646
+      Left = 750
-      Top = 10
+      Top = 11
       Width = 36
       Height = 12
       Caption = #25195'  '#25551
     end
+    object Label5: TLabel
+      Left = 350
+      Top = 11
+      Width = 24
+      Height = 12
+      Caption = #32534#21495
+    end
     object C_name: TEdit
       Tag = 2
-      Left = 257
+      Left = 237
-      Top = 6
+      Top = 7
       Width = 100
       Height = 20
       TabOrder = 0
@@ -133,7 +139,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList
     end
     object C_spec: TEdit
       Tag = 2
-      Left = 396
+      Left = 513
       Top = 7
       Width = 100
       Height = 20
@@ -142,7 +148,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList
     end
     object BatchNo: TEdit
       Tag = 2
-      Left = 549
+      Left = 666
       Top = 7
       Width = 78
       Height = 20
@@ -150,13 +156,22 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList
       OnChange = FromCoNameChange
     end
     object BCIID: TEdit
-      Left = 688
+      Left = 792
-      Top = 6
+      Top = 7
       Width = 106
       Height = 20
       TabOrder = 4
       OnKeyPress = BCIIDKeyPress
     end
+    object C_Code: TEdit
+      Tag = 2
+      Left = 380
+      Top = 7
+      Width = 100
+      Height = 20
+      TabOrder = 5
+      OnChange = TBFindClick
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0

T02贸易汇总仓库/U_TradeSampleClothStkList.pas

@@ -77,6 +77,8 @@ type
     adoqueryPicture: TADOQuery;
     Tv1Column13: TcxGridDBColumn;
     ADOQuery2: TADOQuery;
+    C_Code: TEdit;
+    Label5: TLabel;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBRafreshClick(Sender: TObject);

T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm

@@ -200,7 +200,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel
     PopupMenu = PopupMenu1
     TabOrder = 2
     ExplicitLeft = -2
-    ExplicitTop = 80
+    ExplicitTop = 70
     object Tv1: TcxGridDBTableView
       OnMouseDown = Tv1MouseDown
       Navigator.Buttons.CustomButtons = <>
@@ -482,6 +482,20 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
       end
+      object Tv1Column11: TcxGridDBColumn
+        Caption = #39068#33394
+        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 70
+      end
+      object Tv1Column12: TcxGridDBColumn
+        Caption = #33394#21495
+        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 72
+      end
     end
     object cxGrid2Level1: TcxGridLevel
       GridView = Tv1
@@ -520,6 +534,8 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel
           BevelInner = bvLowered
           BorderStyle = bsNone
           TabOrder = 0
+          ExplicitLeft = 4
+          ExplicitTop = 13
         end
       end
     end

T02贸易汇总仓库/U_TradeSampleClothStkSel.pas

@@ -82,6 +82,8 @@ type
     GroupBox1: TGroupBox;
     ScrollBox1: TScrollBox;
     Tv1Column10: TcxGridDBColumn;
+    Tv1Column11: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBRafreshClick(Sender: TObject);
@@ -126,9 +128,20 @@ begin
 end;
 
 procedure TfrmTradeSampleClothStkSel.FormClose(Sender: TObject; var Action: TCloseAction);
+var
+  i, j: integer;
 begin
   inherited;
-  Action := caFree;
+  j := length(Mach);
+  if j > 0 then
+  begin
+    for i := 0 to j - 1 do
+    begin
+      Mach[i].free;
+    end;
+  end;
+  SetLength(Mach, 0);
+  Action := cafree;
 end;
 
 procedure TfrmTradeSampleClothStkSel.InitGrid();
@@ -301,6 +314,7 @@ begin
     Exit;
   end;
   ModalResult := 1;
+
 end;
 
 procedure TfrmTradeSampleClothStkSel.ToolButton2Click(Sender: TObject);

T03贸易布匹检验/U_TradeMachInsp.dfm

@@ -7,7 +7,6 @@
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitLeft = -180
   ExplicitWidth = 1556
   ExplicitHeight = 809
   PixelsPerInch = 96
@@ -213,8 +212,8 @@
         OnKeyPress = MJstr3KeyPress
       end
       object BTPrint: TButton
-        Left = 283
+        Left = 290
-        Top = 249
+        Top = 241
         Width = 120
         Height = 57
         Caption = #25552#20132

T04贸易明细仓库/U_TradeClothInListNew.dfm

@@ -462,8 +462,10 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
         ParentFont = False
         PopupMenu = PM_2
         TabOrder = 1
+        ExplicitTop = 59
         object TV2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
           OnCellDblClick = TV2CellDblClick
           OnCustomDrawCell = TV2CustomDrawCell
           DataController.DataSource = DS_2
@@ -536,6 +538,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn2: TcxGridDBColumn
             Caption = #20837#24211#26102#38388
             DataBinding.FieldName = 'IOTime'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 103
@@ -543,6 +546,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn13: TcxGridDBColumn
             Caption = #20837#24211#31867#22411
             DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 75
@@ -551,6 +555,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
             Tag = 11
             Caption = #35745#21010#21333#21495
             DataBinding.FieldName = 'OrderNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 95
@@ -558,6 +563,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn4: TcxGridDBColumn
             Caption = #20135#21697#21517#31216
             DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 77
@@ -565,12 +571,14 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn5: TcxGridDBColumn
             Caption = #23458#25143
             DataBinding.FieldName = 'CustName'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 66
           end
           object cxGridDBColumn7: TcxGridDBColumn
             Caption = #21367#25968
             DataBinding.FieldName = 'SumPieceNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -578,6 +586,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn8: TcxGridDBColumn
             Caption = #27611#37325
             DataBinding.FieldName = 'SumGrossWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -585,6 +594,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn9: TcxGridDBColumn
             Caption = #30382#37325
             DataBinding.FieldName = 'SumTare'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -592,6 +602,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn10: TcxGridDBColumn
             Caption = #20928#37325
             DataBinding.FieldName = 'SumNetWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -599,6 +610,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn11: TcxGridDBColumn
             Caption = #31859#25968
             DataBinding.FieldName = 'SumMeter'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -606,6 +618,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn12: TcxGridDBColumn
             Caption = #30721#25968
             DataBinding.FieldName = 'SumYardage'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -613,6 +626,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn14: TcxGridDBColumn
             Caption = #21697#36136
             DataBinding.FieldName = 'Grade'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -620,6 +634,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn15: TcxGridDBColumn
             Caption = #38376#24133
             DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -627,6 +642,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn16: TcxGridDBColumn
             Caption = #20811#37325
             DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -634,6 +650,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object cxGridDBColumn17: TcxGridDBColumn
             Caption = #26816#39564#26426#21488
             DataBinding.FieldName = 'CIMachNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -641,6 +658,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object TV2Column2: TcxGridDBColumn
             Caption = #24211#23384
             DataBinding.FieldName = 'IOPosition'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -648,6 +666,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object TV2Column3: TcxGridDBColumn
             Caption = #39068#33394
             DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -656,12 +675,14 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
             Tag = 11
             Caption = #26412#21378#32568#21495
             DataBinding.FieldName = 'BatchNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 73
           end
           object TV2Column4: TcxGridDBColumn
             Caption = #33457#22411
             DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 77
@@ -670,6 +691,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
             Tag = 11
             Caption = 'SubId'
             DataBinding.FieldName = 'Subid'
+            DataBinding.IsNullValueType = True
             Visible = False
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
@@ -678,28 +700,40 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object TV2Column6: TcxGridDBColumn
             Caption = #19994#21153#21592
             DataBinding.FieldName = 'Saleser'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column7: TcxGridDBColumn
             Caption = #33394#21495
             DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column8: TcxGridDBColumn
             Caption = #21512#21516#21495
             DataBinding.FieldName = 'ConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column9: TcxGridDBColumn
             Caption = #23458#25143#21333#21495
             DataBinding.FieldName = 'BuyConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
           object TV2Column10: TcxGridDBColumn
             Caption = #20135#21697#32534#21495
             DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
           end
+          object TV2Column11: TcxGridDBColumn
+            Caption = #25805#20316#21592
+            DataBinding.FieldName = 'Filler'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 60
+          end
         end
         object cxGridLevel1: TcxGridLevel
           GridView = TV2
@@ -709,9 +743,6 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
     object cxTabSheet2: TcxTabSheet
       Caption = '  '#20135#21697#26126#32454#20449#24687'  '
       ImageIndex = 1
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Panel6: TPanel
         Left = 0
         Top = 61
@@ -1216,6 +1247,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
         TabOrder = 2
         object Tv1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
+          ScrollbarAnnotations.CustomAnnotations = <>
           DataController.DataSource = DS_1
           DataController.Filter.AutoDataSetFilter = True
           DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -1287,6 +1319,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column22: TcxGridDBColumn
             Caption = #36873#25321
             DataBinding.FieldName = 'SSel'
+            DataBinding.IsNullValueType = True
             PropertiesClassName = 'TcxCheckBoxProperties'
             Properties.ImmediatePost = True
             Properties.NullStyle = nssUnchecked
@@ -1297,6 +1330,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column21: TcxGridDBColumn
             Caption = #20837#24211#21333#21495
             DataBinding.FieldName = 'IONO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 103
@@ -1304,17 +1338,20 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column9: TcxGridDBColumn
             Caption = #20837#24211#26102#38388
             DataBinding.FieldName = 'IOTime'
+            DataBinding.IsNullValueType = True
             Options.Editing = False
             Width = 82
           end
           object Tv1Column11: TcxGridDBColumn
             Caption = #20837#24211#31867#22411
             DataBinding.FieldName = 'IOType'
+            DataBinding.IsNullValueType = True
             Options.Editing = False
           end
           object v1Column32: TcxGridDBColumn
             Caption = #21512#21516#21495
             DataBinding.FieldName = 'ConNO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 76
@@ -1322,6 +1359,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column1: TcxGridDBColumn
             Caption = #35745#21010#21333#21495
             DataBinding.FieldName = 'OrderNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 78
@@ -1329,6 +1367,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column4: TcxGridDBColumn
             Caption = #20135#21697#32534#21495
             DataBinding.FieldName = 'C_Code'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 74
@@ -1336,6 +1375,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column13: TcxGridDBColumn
             Caption = #20135#21697#21517#31216
             DataBinding.FieldName = 'C_Name'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1343,6 +1383,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column4: TcxGridDBColumn
             Caption = #39068#33394
             DataBinding.FieldName = 'C_Color'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1350,6 +1391,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column18: TcxGridDBColumn
             Caption = #21345#21495
             DataBinding.FieldName = 'PCId'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1357,6 +1399,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column23: TcxGridDBColumn
             Caption = #21367#21495
             DataBinding.FieldName = 'PieceNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1364,6 +1407,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column8: TcxGridDBColumn
             Caption = #27611#37325
             DataBinding.FieldName = 'GrossWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1371,6 +1415,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column27: TcxGridDBColumn
             Caption = #30382#37325
             DataBinding.FieldName = 'Tare'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1378,6 +1423,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column28: TcxGridDBColumn
             Caption = #20928#37325
             DataBinding.FieldName = 'NetWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1385,6 +1431,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column10: TcxGridDBColumn
             Caption = #31859#25968
             DataBinding.FieldName = 'Meter'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1392,6 +1439,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column12: TcxGridDBColumn
             Caption = #24211#20301
             DataBinding.FieldName = 'IOPosition'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 71
@@ -1399,6 +1447,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column10: TcxGridDBColumn
             Caption = #30721#25968
             DataBinding.FieldName = 'Yardage'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1406,6 +1455,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column12: TcxGridDBColumn
             Caption = #21697#36136
             DataBinding.FieldName = 'Grade'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1413,6 +1463,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column42: TcxGridDBColumn
             Caption = #24635#35760#24405#25968
             DataBinding.FieldName = 'TotalCount'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1420,6 +1471,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column6: TcxGridDBColumn
             Caption = #21367#26465#30721
             DataBinding.FieldName = 'CIID'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1427,6 +1479,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column7: TcxGridDBColumn
             Caption = #23458#25143#33457#22411
             DataBinding.FieldName = 'C_CustPattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1434,6 +1487,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column3: TcxGridDBColumn
             Caption = #38376#24133
             DataBinding.FieldName = 'C_Width'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1441,6 +1495,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column5: TcxGridDBColumn
             Caption = #20811#37325
             DataBinding.FieldName = 'C_GramWeight'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1448,6 +1503,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column34: TcxGridDBColumn
             Caption = #32568#26465#30721
             DataBinding.FieldName = 'BCIOID'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1455,6 +1511,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column40: TcxGridDBColumn
             Caption = #33457#22411
             DataBinding.FieldName = 'C_Pattern'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1462,6 +1519,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object v1Column46: TcxGridDBColumn
             Caption = #26816#39564#26426#21488
             DataBinding.FieldName = 'CIMachNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1469,6 +1527,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column5: TcxGridDBColumn
             Caption = #21253#21495
             DataBinding.FieldName = 'PacketNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1476,12 +1535,14 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object VC_BaoID: TcxGridDBColumn
             Caption = #21253#26465#30721
             DataBinding.FieldName = 'PacketId'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
           end
           object Tv1Column8: TcxGridDBColumn
             Caption = #23458#25143#21333#21495
             DataBinding.FieldName = 'BuyConNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1489,6 +1550,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column3: TcxGridDBColumn
             Caption = #33394#21495
             DataBinding.FieldName = 'C_ColorNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1496,6 +1558,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column1: TcxGridDBColumn
             Caption = #27454#21495
             DataBinding.FieldName = 'C_StyleNo'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1503,6 +1566,7 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column2: TcxGridDBColumn
             Caption = #33521#25991#39068#33394
             DataBinding.FieldName = 'C_EColor'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Options.Editing = False
             Width = 66
@@ -1510,9 +1574,17 @@ inherited frmTradeClothInListNew: TfrmTradeClothInListNew
           object Tv1Column6: TcxGridDBColumn
             Caption = #26412#21378#32568#21495
             DataBinding.FieldName = 'BatchNO'
+            DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
             Width = 66
           end
+          object Tv1Column13: TcxGridDBColumn
+            Caption = #25805#20316#21592
+            DataBinding.FieldName = 'Filler'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+            Width = 60
+          end
         end
         object cxGrid1Level1: TcxGridLevel
           GridView = Tv1

T04贸易明细仓库/U_TradeClothInListNew.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
   TfrmTradeClothInListNew = class(TfrmBaseList)
@@ -161,6 +161,8 @@ type
     TV2Column10: TcxGridDBColumn;
     Label11: TLabel;
     Edit6: TEdit;
+    TV2Column11: TcxGridDBColumn;
+    Tv1Column13: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -275,7 +277,7 @@ begin
           Close;
           sql.Clear;
           sql.Add(' select IOTime=CONVERT(VARCHAR(10),IOTime,120),OrderNo,Subid,C_Name ,IOType,Grade,CustName,C_Width,C_GramWeight');
-          sql.Add(' ,CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,Saleser,C_ColorNo,ConNo,BuyConNo,C_Code ');
+          sql.Add(' ,CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,Saleser,C_ColorNo,ConNo,BuyConNo,C_Code,Filler ');
           sql.Add(',COUNT(PieceNo) SumPieceNo,sum(GrossWeight) SumGrossWeight,sum(Tare) SumTare,sum(NetWeight) SumNetWeight');
           sql.Add(' ,Sum(Meter) SumMeter,Sum(Yardage) SumYardage');
           sql.Add(' from V_Trade_Cloth_IO A  where IOFlag=''Èë¿â'' ');
@@ -284,7 +286,7 @@ begin
 
           sql.Add(WSql);
           sql.Add(' GROUP BY   CONVERT(VARCHAR(10),IOTime,120),OrderNo,Subid,C_Name ,IOType ,Grade,CustName,C_Width,C_GramWeight');
-          sql.Add(',CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,Saleser,C_ColorNo,ConNo,BuyConNo,C_Code');
+          sql.Add(',CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,Saleser,C_ColorNo,ConNo,BuyConNo,C_Code,Filler');
 //          ShowMessage(SQL.Text);
           Open;
         end;

T04贸易明细仓库/U_TradeClothOutListNew.dfm

@@ -583,6 +583,10 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
             item
               Kind = skSum
               Column = cxGridDBColumn7
+            end
+            item
+              Kind = skSum
+              Column = cxGridDBColumn12
             end>
           DataController.Summary.SummaryGroups = <>
           OptionsCustomize.ColumnFiltering = False
@@ -791,6 +795,12 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
             HeaderAlignmentHorz = taCenter
             Width = 123
           end
+          object TV2Column12: TcxGridDBColumn
+            Caption = #25805#20316#21592
+            DataBinding.FieldName = 'Filler'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+          end
         end
         object cxGridLevel1: TcxGridLevel
           GridView = TV2
@@ -1391,6 +1401,10 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
             end
             item
               Kind = skSum
+            end
+            item
+              Kind = skSum
+              Column = Tv1Column10
             end>
           DataController.Summary.SummaryGroups = <>
           OptionsCustomize.ColumnFiltering = False
@@ -1645,6 +1659,12 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
             HeaderAlignmentHorz = taCenter
             Width = 66
           end
+          object Tv1Column14: TcxGridDBColumn
+            Caption = #25805#20316#21592
+            DataBinding.FieldName = 'Filler'
+            DataBinding.IsNullValueType = True
+            HeaderAlignmentHorz = taCenter
+          end
         end
         object cxGrid1Level1: TcxGridLevel
           GridView = Tv1
@@ -1675,6 +1695,8 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
       ParentFont = False
       PopupMenu = PM_2
       TabOrder = 0
+      ExplicitLeft = -134
+      ExplicitTop = 66
       object TV3: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
@@ -1958,6 +1980,8 @@ inherited frmTradeClothOutListNew: TfrmTradeClothOutListNew
       Color = clHighlight
       ParentBackground = False
       TabOrder = 1
+      ExplicitLeft = -7
+      ExplicitTop = 2
       object Button1: TButton
         Left = 769
         Top = 1

T04贸易明细仓库/U_TradeClothOutListNew.pas

@@ -200,6 +200,8 @@ type
     TV2Column11: TcxGridDBColumn;
     TV3Column1: TcxGridDBColumn;
     Tv1Column13: TcxGridDBColumn;
+    TV2Column12: TcxGridDBColumn;
+    Tv1Column14: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -331,7 +333,7 @@ begin
 //          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(' ,CIMachNo,Workshop,BatchNo,IOPosition,IONote,C_Color,C_Pattern,Saleser,C_ColorNo,ConNo,BuyConNo,C_Code,IoNo,Filler ');
           sql.Add(' ,COUNT(PieceNo) SumPieceNo,sum(GrossWeight) SumGrossWeight,sum(Tare) SumTare,sum(NetWeight) SumNetWeight');
           sql.Add(' ,Sum(Meter) SumMeter,Sum(Yardage) SumYardage');
           sql.Add(' from V_Trade_Cloth_IO A ');
@@ -341,7 +343,7 @@ begin
             sql.Add('  and Workshop=''' + trim(FWorkshop) + ''' ');
 
           sql.Add(' GROUP BY   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(' ,CIMachNo,Workshop,BatchNo,IOPosition,IONOte,C_Color,C_Pattern,Saleser,C_ColorNo,ConNo,BuyConNo,C_Code,IONo,Filler ');
 //          showmessage(sql.text);
           Open;
         end;

T04贸易明细仓库/U_TradeClothStkListNew.dfm

@@ -7,8 +7,6 @@
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
-  ExplicitLeft = -348
-  ExplicitTop = -5
   ExplicitWidth = 1556
   ExplicitHeight = 631
   PixelsPerInch = 96
@@ -148,7 +146,7 @@
     Font.Style = [fsBold]
     ParentFont = False
     TabOrder = 1
-    Properties.ActivePage = cxTabSheet1
+    Properties.ActivePage = cxTabSheet2
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 5
     OnChange = cxPageControl1Change
@@ -169,7 +167,6 @@
         Color = clWhite
         ParentBackground = False
         TabOrder = 0
-        ExplicitTop = 2
         object Label4: TLabel
           Left = 195
           Top = 10
@@ -598,7 +595,6 @@
         ParentFont = False
         PopupMenu = PM_2
         TabOrder = 1
-        ExplicitTop = 73
         object TV2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -1779,9 +1775,16 @@
         Left = 420
         Top = 162
         Width = 312
-        Height = 205
+        Height = 215
         TabOrder = 3
         Visible = False
+        object Label21: TLabel
+          Left = 43
+          Top = 184
+          Width = 88
+          Height = 21
+          Caption = #35745#20215#21333#20301
+        end
         object Panel2: TPanel
           Left = 1
           Top = 1
@@ -1883,6 +1886,16 @@
             #35746#21333
             #24211#23384)
         end
+        object JSUnit: TComboBox
+          Left = 157
+          Top = 175
+          Width = 113
+          Height = 29
+          TabOrder = 7
+          Items.Strings = (
+            'M'
+            'Kg')
+        end
       end
     end
   end

T04贸易明细仓库/U_TradeClothStkListNew.pas

@@ -193,6 +193,8 @@ type
     Panel4: TPanel;
     Label17: TLabel;
     Panel5: TPanel;
+    Label21: TLabel;
+    JSUnit: TComboBox;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -492,7 +494,8 @@ begin
     Label15.Caption := '库龄超90天';
     Label16.Caption := '库龄超12月';
     Label17.Caption := '库龄超18月';
-  end else if Canshu5='¿â´æ' then
+  end
+  else if Canshu5 = '库存' then
   begin
     Label15.Caption := '库龄超2年';
     Label16.Caption := '库龄超3年';
@@ -581,7 +584,8 @@ begin
       ACanvas.Brush.Color := $00A5FF;
     if AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('kl').Index] > 548 then
       ACanvas.Brush.Color := $0000FF;
-  end else  if canshu5 = '¿â´æ' then
+  end
+  else if canshu5 = '库存' then
   begin
     if AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('kl').Index] > 730 then
       ACanvas.Brush.Color := $B3DEF5;
@@ -913,19 +917,44 @@ begin
         FM := CDS_1.FieldByName('Meter').AsFloat;
         FY := CDS_1.FieldByName('Yardage').AsFloat;
         FZ := CDS_1.FieldByName('NetWeight').AsFloat;
-        if CDS_1.FieldByName('OrdUnit').AsString = 'M' then
+
+        if (FM <> 0) and (FZ <> 0) then
         begin
+          if JSunit.Text = '' then
+          begin
+            Application.MessageBox('请先选择计价单位!', '提示', 0);
+            Exit;
+          end
+          else
+          begin
+            if JSUnit.Text = 'Kg' then
+              FAmount := RoundFloat(FZ * FPrice, 2)
+            else if JSUnit.Text = 'M' then
               FAmount := RoundFloat(FM * FPrice, 2);
+          end;
         end
-        else if CDS_1.FieldByName('OrdUnit').AsString = 'Y' then
+        else if FM = 0 then
-        begin
-          FAmount := RoundFloat(FY * FPrice, 2);
-        end
-        else if CDS_1.FieldByName('OrdUnit').AsString = 'Kg' then
         begin
           FAmount := RoundFloat(FZ * FPrice, 2);
+        end
+        else if FZ = 0 then
+        begin
+          FAmount := RoundFloat(FM * FPrice, 2);
         end;
 
+//        if CDS_1.FieldByName('OrdUnit').AsString = 'M' then
+//        begin
+//          FAmount := RoundFloat(FM * FPrice, 2);
+//        end
+//        else if CDS_1.FieldByName('OrdUnit').AsString = 'Y' then
+//        begin
+//          FAmount := RoundFloat(FY * FPrice, 2);
+//        end
+//        else if CDS_1.FieldByName('OrdUnit').AsString = 'Kg' then
+//        begin
+//          FAmount := RoundFloat(FZ * FPrice, 2);
+//        end;
+
         MAmount := FloatToStr(FAmount);
 
         with ADOQueryCmd do