1

2024-08-08 16:35:41 +08:00 · 2024-08-08 16:35:41 +08:00 · b5fbedfd26
commit b5fbedfd26
parent 61d962fc85
67 changed files with 7393 additions and 5460 deletions
--- a/项目代码/RTBasicsV1/D01针织生产计划/KnitPlan.dpr
+++ b/项目代码/RTBasicsV1/D01针织生产计划/KnitPlan.dpr
@ -1,5 +1,4 @@
 library KnitPlan;
-
 uses
  SysUtils,
  classes,
@ -34,34 +33,34 @@ uses
  U_WindowFormdesign in '..\..\..\public10\design\U_WindowFormdesign.pas',
  U_LoomSel in '..\A00通用窗体\U_LoomSel.pas' {frmLoomSel},
  U_EmployeeSel in '..\A00通用窗体\U_EmployeeSel.pas' {frmEmployeeSel},
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule},
+  U_KnitPlanList in 'U_KnitPlanList.pas' {frmKnitPlanList},
+  U_KnitPlanInPut in 'U_KnitPlanInPut.pas' {frmKnitPlanInPut},
+  U_KnitPlanCard in 'U_KnitPlanCard.pas' {frmKnitPlanCard},
  FrameDateSel in '..\A00通用组件\FrameDateSel.pas' {frmFrameDateSel: TFrame},
  FramePagingSel in '..\A00通用组件\FramePagingSel.pas' {frmFramePagingSel: TFrame},
-  U_KnitPlanList in 'U_KnitPlanList.pas' {frmKnitPlanList},
-  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};
+  U_KnitCardMachInPut in 'U_KnitCardMachInPut.pas' {frmKnitCardMachInPut},
+  U_KnitPlanProgress in 'U_KnitPlanProgress.pas' {frmKnitPlanProgress},
+  U_WageListTKJ in 'U_WageListTKJ.pas' {frmWageListTKJ},
+  U_DCYueMoney in 'U_DCYueMoney.pas' {frmDCYueMoney};

 {$R *.res}
-
 procedure DllEnterPoint(dwReason: DWORD); far; stdcall;
 begin
  DLLProc := @DLLEnterPoint;
  DllEnterPoint(DLL_PROCESS_ATTACH);
 end;
-
 procedure DLLUnloadProc(Reason: Integer); register;
 begin
 //  if (Reason = DLL_PROCESS_DETACH) or (Reason = DLL_THREAD_DETACH) then
 //    Application := NewDllApp;
 end;
-
 exports
  GetDllForm;
-
 begin
  try
    NewDllApp := Application;
    DLLProc := @DLLUnloadProc;
  except
-
  end;
 end.
-
--- a/项目代码/RTBasicsV1/D01针织生产计划/KnitPlan.dproj
+++ b/项目代码/RTBasicsV1/D01针织生产计划/KnitPlan.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:\RTFormwork\项目代码\RTBasicsV1\D01针织生产计划\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\rtformwork\项目代码\RTBasicsV1\D01针织生产计划\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
@ -211,6 +211,23 @@
            <Form>frmEmployeeSel</Form>
            <FormType>dfm</FormType>
        </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
+            <Form>BaseDataLink</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
+        <DCCReference Include="U_KnitPlanList.pas">
+            <Form>frmKnitPlanList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_KnitPlanInPut.pas">
+            <Form>frmKnitPlanInPut</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_KnitPlanCard.pas">
+            <Form>frmKnitPlanCard</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
        <DCCReference Include="..\A00通用组件\FrameDateSel.pas">
            <Form>frmFrameDateSel</Form>
            <FormType>dfm</FormType>
@ -221,14 +238,21 @@
            <FormType>dfm</FormType>
            <DesignClass>TFrame</DesignClass>
        </DCCReference>
-        <DCCReference Include="U_KnitPlanList.pas">
-            <Form>frmKnitPlanList</Form>
+        <DCCReference Include="U_KnitCardMachInPut.pas">
+            <Form>frmKnitCardMachInPut</Form>
            <FormType>dfm</FormType>
        </DCCReference>
-        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
-            <Form>BaseDataLink</Form>
+        <DCCReference Include="U_KnitPlanProgress.pas">
+            <Form>frmKnitPlanProgress</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_WageListTKJ.pas">
+            <Form>frmWageListTKJ</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_DCYueMoney.pas">
+            <Form>frmDCYueMoney</Form>
            <FormType>dfm</FormType>
-            <DesignClass>TDataModule</DesignClass>
        </DCCReference>
        <BuildConfiguration Include="Debug">
            <Key>Cfg_2</Key>
--- a/项目代码/RTBasicsV1/D01针织生产计划/KnitPlan.dproj.local
+++ b/项目代码/RTBasicsV1/D01针织生产计划/KnitPlan.dproj.local
@ -1,62 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.811,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitPlanList.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.951,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.726,=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.772,=D:\rtformwork\项目代码\RTBasicsV1\D01针织生产计划\U_KnitPlanProgress.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.257,=D:\Dp10Repo\项目代码\恒赫\D01针织生产计划\U_MachPlanSet.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.811,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitPlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.566,=D:\rtformwork\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.111,=D:\Dp10Repo\项目代码\共佳\B02基础纱线仓库\U_YarnInfoInPut.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.726,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.064,D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_KnitPlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.911,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.756,D:\Dp10Repo\项目代码\园中圆\D01针织生产计划\U_KnitPlanCard.dfm=D:\Dp10Repo\项目代码\园中圆\D01针织生产计划\U_KnitPlanCardDel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.925,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.509,D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.dfm=D:\Dp10Repo\项目代码\RTBasics\D00针织通用窗体\U_KnitSalesContractSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.139,D:\RTFormwork\项目代码\RTBasicsV1\A02基础产品管理\U_KnitClothInfoInput.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_KnitPlanSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.612,=D:\Dp10Repo\项目代码\RTBasics\D00针织通用窗体\U_KnitPlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.806,=D:\rtformwork\项目代码\RTBasicsV1\D01针织生产计划\U_DCYueMoney.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.951,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.111,=D:\Dp10Repo\项目代码\共佳\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.140,=D:\RTFormwork\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.340,=D:\rtformwork\项目代码\RTBasicsV1\A00通用组件\FramePagingSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_KnitPlanSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.286,=D:\rtformwork\项目代码\RTBasicsV1\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.139,D:\RTFormwork\项目代码\RTBasicsV1\A02基础产品管理\U_KnitClothInfoInput.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.509,D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.dfm=D:\Dp10Repo\项目代码\RTBasics\D00针织通用窗体\U_KnitSalesContractSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.756,D:\Dp10Repo\项目代码\园中圆\D01针织生产计划\U_KnitPlanCard.dfm=D:\Dp10Repo\项目代码\园中圆\D01针织生产计划\U_KnitPlanCardDel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.019,=D:\rtformwork\项目代码\RTBasicsV1\D01针织生产计划\U_KnitPlanInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.925,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\Unit1.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.756,D:\Dp10Repo\项目代码\园中圆\D01针织生产计划\U_KnitPlanCard.pas=D:\Dp10Repo\项目代码\园中圆\D01针织生产计划\U_KnitPlanCardDel.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.289,=D:\rtformwork\项目代码\RTBasicsV1\D01针织生产计划\U_KnitPlanCard.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.612,=D:\Dp10Repo\项目代码\RTBasics\D00针织通用窗体\U_KnitPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.140,=D:\RTFormwork\public10\design\U_cxGridCustomSet.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.031,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.509,D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas=D:\Dp10Repo\项目代码\RTBasics\D00针织通用窗体\U_KnitSalesContractSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.181,=D:\RTFormwork\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.638,=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.988,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\KnitPlan.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.638,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.415,=D:\rtformwork\项目代码\RTBasicsV1\D01针织生产计划\U_WageListTKJ.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.798,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
    <Transaction>1899-12-30 00:00:00.000.709,D:\RTFormwork\项目代码\RTBasicsV1\B02基础纱线仓库\U_YarnInfoInPut.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.945,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.232,=D:\RTFormwork\项目代码\RTBasicsV1\A00通用窗体\U_LoomSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.064,D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_KnitPlanSel.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.881,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitCardInPut.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.929,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.667,=D:\Dp10Repo\项目代码\共佳\A02基础产品管理\U_KnitClothInfoInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.064,D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_KnitPlanSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.616,=D:\rtformwork\项目代码\RTBasicsV1\D01针织生产计划\U_KnitCardMachInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.911,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.064,D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_KnitPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.264,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitPlanCard.pas</Transaction>
-    <Transaction>2024-07-16 16:57:34.000.356,=D:\RTFormwork\项目代码\RTBasicsV1\A00通用组件\FrameDateSel.pas</Transaction>
-    <Transaction>2024-07-16 16:57:34.000.480,=D:\RTFormwork\项目代码\RTBasicsV1\A00通用组件\FramePagingSel.pas</Transaction>
-    <Transaction>2024-07-16 17:00:42.000.758,=D:\RTFormwork\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.667,=D:\Dp10Repo\项目代码\共佳\A02基础产品管理\U_KnitClothInfoInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.945,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.232,=D:\RTFormwork\项目代码\RTBasicsV1\A00通用窗体\U_LoomSel.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="android-support-v4.dex.jar"/>
@ -117,7 +123,7 @@
    <File Path="..\D00针织通用窗体\U_KnitPlanSel.dfm"/>
    <File Path="..\D00针织通用窗体\U_KnitSalesContractSel.pas"/>
    <File Path="..\D00针织通用窗体\U_KnitSalesContractSel.dfm"/>
-    <File Path="D:\RTFormwork"/>
+    <File Path="D:\rtformwork"/>
    <File Path="..\..\..\public10"/>
    <File Path="..\..\..\public10\design"/>
    <File Path="..\..\..\public10\design\U_BaseHelp.pas"/>
@ -150,5 +156,17 @@
    <File Path="U_KnitPlanCardDel.dfm"/>
    <File Path="U_MachPlanSet.pas"/>
    <File Path="U_MachPlanSet.dfm"/>
+    <File Path="U_KnitPlanInPut.pas"/>
+    <File Path="U_KnitPlanInPut.dfm"/>
+    <File Path="U_KnitPlanCard.pas"/>
+    <File Path="U_KnitPlanCard.dfm"/>
+    <File Path="U_KnitCardMachInPut.pas"/>
+    <File Path="U_KnitCardMachInPut.dfm"/>
+    <File Path="U_KnitPlanProgress.pas"/>
+    <File Path="U_KnitPlanProgress.dfm"/>
+    <File Path="U_WageListTKJ.pas"/>
+    <File Path="U_WageListTKJ.dfm"/>
+    <File Path="U_DCYueMoney.pas"/>
+    <File Path="U_DCYueMoney.dfm"/>
  </ProjectSortOrder>
 </BorlandProject>
--- a/项目代码/RTBasicsV1/D01针织生产计划/KnitPlan.identcache
+++ b/项目代码/RTBasicsV1/D01针织生产计划/KnitPlan.identcache
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_DCYueMoney.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_DCYueMoney.dfm
@ -7,15 +7,15 @@ inherited frmDCYueMoney: TfrmDCYueMoney
  ExplicitWidth = 1106
  ExplicitHeight = 789
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 17
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1090
    Height = 33
-    ButtonHeight = 38
-    ButtonWidth = 103
+    ButtonHeight = 30
+    ButtonWidth = 95
    Caption = 'ToolBar1'
    Color = clWhite
    Font.Charset = GB2312_CHARSET
@ -23,12 +23,13 @@ inherited frmDCYueMoney: TfrmDCYueMoney
    Font.Height = -12
    Font.Name = #23435#20307
    Font.Style = []
-    Images = DataLink_KnitPlan.ImageList_new32
+    Images = DataLink_KnitPlan.cxImageList_bar
    List = True
    ParentColor = False
    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
+    ExplicitLeft = -1
    object TBRafresh: TToolButton
      Left = 0
      Top = 0
@ -38,7 +39,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      OnClick = TBRafreshClick
    end
    object TBFind: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #36807#28388
@ -46,7 +47,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      OnClick = TBFindClick
    end
    object ToolButton2: TToolButton
-      Left = 142
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #20135#37327#32479#35745#34920
@ -55,7 +56,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      OnClick = ToolButton2Click
    end
    object ToolButton1: TToolButton
-      Left = 249
+      Left = 225
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -63,7 +64,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 320
+      Left = 288
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -108,25 +109,37 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      Font.Style = [fsBold]
      ParentFont = False
    end
-    object DCGName: TEdit
+    object DCGName: TcxTextEdit
      Tag = 2
-      Left = 175
-      Top = 8
-      Width = 119
-      Height = 20
+      Left = 177
+      Top = 6
+      AutoSize = False
+      ParentFont = False
      TabOrder = 0
      Visible = False
-      OnChange = DCGNameChange
+      Height = 25
+      Width = 119
    end
-    object Begdate: TDateTimePicker
-      Left = 52
+    object Begdate: TcxDateEdit
+      Left = 53
      Top = 8
-      Width = 80
-      Height = 20
-      Date = 44496.000000000000000000
-      Format = 'yyyy-MM'
-      Time = 44496.000000000000000000
+      AutoSize = False
+      EditValue = 44496d
+      ParentFont = False
+      Properties.ShowTime = False
+      Style.Font.Charset = ANSI_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -12
+      Style.Font.Name = #24494#36719#38597#40657
+      Style.Font.Style = []
+      Style.LookAndFeel.NativeStyle = True
+      Style.IsFontAssigned = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 1
+      Height = 20
+      Width = 80
    end
  end
  object cxGrid1: TcxGrid [2]
@ -138,6 +151,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
    TabOrder = 2
    object Tv1: TcxGridDBBandedTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DataSource1
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <
@ -643,6 +657,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
        end>
      object v1Column1: TcxGridDBBandedColumn
        DataBinding.FieldName = 'DCGName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -653,6 +668,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column2: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ26'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -663,6 +679,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column4: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ25'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -673,6 +690,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column5: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ23'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -683,6 +701,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column6: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ22'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -693,6 +712,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column8: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ24'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -703,6 +723,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column9: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ21'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -713,6 +734,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column10: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ20'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -723,6 +745,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column12: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ19'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -733,6 +756,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column13: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ18'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -744,6 +768,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column14: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ16'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -754,6 +779,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column16: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ15'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -764,6 +790,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column17: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ14'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -774,6 +801,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column18: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ13'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -784,6 +812,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column20: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ17'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -794,6 +823,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column21: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ12'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -804,6 +834,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column22: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ11'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -814,6 +845,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column25: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ27'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -824,6 +856,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column26: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ5'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -834,6 +867,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column28: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ9'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -844,6 +878,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column29: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ10'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -854,6 +889,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column54: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ7'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -864,6 +900,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column55: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ6'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -874,6 +911,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column56: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ3'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -884,6 +922,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column57: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ2'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -894,6 +933,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column58: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ4'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -904,6 +944,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column59: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ1'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -914,6 +955,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column60: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ8'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -924,6 +966,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column61: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ0'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -934,6 +977,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column62: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ29'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -944,6 +988,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column63: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ30'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -954,6 +999,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column64: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZ28'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -964,6 +1010,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column65: TcxGridDBBandedColumn
        DataBinding.FieldName = 'GZHZ'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Options.Moving = False
@ -974,6 +1021,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column3: TcxGridDBBandedColumn
        DataBinding.FieldName = 'SCMoney'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
        Position.BandIndex = 33
        Position.ColIndex = 0
@ -981,6 +1029,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column7: TcxGridDBBandedColumn
        DataBinding.FieldName = 'KJQty'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
        Position.BandIndex = 34
        Position.ColIndex = 0
@ -988,6 +1037,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column11: TcxGridDBBandedColumn
        DataBinding.FieldName = 'QuanQty'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
        Position.BandIndex = 35
        Position.ColIndex = 0
@ -995,6 +1045,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column15: TcxGridDBBandedColumn
        DataBinding.FieldName = 'FaMoney'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
        Position.BandIndex = 37
        Position.ColIndex = 0
@ -1002,6 +1053,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column19: TcxGridDBBandedColumn
        DataBinding.FieldName = 'JiangMoney'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
        Position.BandIndex = 38
        Position.ColIndex = 0
@ -1009,6 +1061,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column23: TcxGridDBBandedColumn
        DataBinding.FieldName = 'DayQty'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
        Position.BandIndex = 39
        Position.ColIndex = 0
@ -1016,6 +1069,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object v1Column24: TcxGridDBBandedColumn
        DataBinding.FieldName = 'BuTie'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
        Position.BandIndex = 36
        Position.ColIndex = 0
@ -1023,6 +1077,7 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      end
      object Tv1Column1: TcxGridDBBandedColumn
        DataBinding.FieldName = 'totalSubsidyPrice'
+        DataBinding.IsNullValueType = True
        Position.BandIndex = 40
        Position.ColIndex = 0
        Position.RowIndex = 0
@ -1032,23 +1087,6 @@ inherited frmDCYueMoney: TfrmDCYueMoney
      GridView = Tv1
    end
  end
-  object MovePanel2: TMovePanel [3]
-    Left = 408
-    Top = 192
-    Width = 289
-    Height = 49
-    BevelInner = bvLowered
-    Caption = #27491#22312#22788#29702#25968#25454#65292#35831#31245#21518#12290#12290#12290
-    Color = clSkyBlue
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clRed
-    Font.Height = -13
-    Font.Name = #23435#20307
-    Font.Style = [fsBold]
-    ParentFont = False
-    TabOrder = 3
-    Visible = False
-  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_KnitPlan.ADOLink
  end
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_DCYueMoney.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_DCYueMoney.pas
@ -12,7 +12,8 @@ uses
  cxDropDownEdit, MovePanel, Menus, cxCheckBox, RM_Dataset, RM_System, RM_Common,
  RM_Class, RM_GridReport, RM_e_Xls, cxPC, cxLookAndFeels, cxLookAndFeelPainters,
  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, U_BaseList;
+  dxBarBuiltInMenu, U_BaseList, dxSkinWXI, dxScrollbarAnnotations, cxContainer,
+  dxCore, cxDateUtils, cxTextEdit, cxMaskEdit, cxCalendar;

 type
  TfrmDCYueMoney = class(TfrmBaseList)
@ -28,7 +29,7 @@ type
    cxGridPopupMenu1: TcxGridPopupMenu;
    CDS_Main: TClientDataSet;
    Label1: TLabel;
-    DCGName: TEdit;
+    DCGName: TcxTextEdit;
    Label2: TLabel;
    cxGridPopupMenu2: TcxGridPopupMenu;
    RMDB_Main: TRMDBDataSet;
@ -72,8 +73,6 @@ type
    v1Column64: TcxGridDBBandedColumn;
    v1Column65: TcxGridDBBandedColumn;
    cxGrid1Level1: TcxGridLevel;
-    MovePanel2: TMovePanel;
-    Begdate: TDateTimePicker;
    ToolButton1: TToolButton;
    v1Column3: TcxGridDBBandedColumn;
    v1Column7: TcxGridDBBandedColumn;
@ -83,6 +82,7 @@ type
    v1Column23: TcxGridDBBandedColumn;
    v1Column24: TcxGridDBBandedColumn;
    Tv1Column1: TcxGridDBBandedColumn;
+    Begdate: TcxDateEdit;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBRafreshClick(Sender: TObject);
@ -126,8 +126,8 @@ end;

 procedure TfrmDCYueMoney.InitGrid();
 begin
-  MovePanel2.Visible := True;
-  MovePanel2.Refresh;
+  //MovePanel2.Visible := True;
+  //MovePanel2.Refresh;
  try
    ADOQueryMain.DisableControls;
    with ADOQueryMain do
@ -144,7 +144,7 @@ begin
  finally
    ADOQueryMain.EnableControls;
  end;
-  MovePanel2.Visible := False;
+  //MovePanel2.Visible := False;
 end;

 procedure TfrmDCYueMoney.TBRafreshClick(Sender: TObject);
@ -195,7 +195,7 @@ begin
  begin
    close;
    sql.Clear;
-    SQL.Add('exec P_View_DAY_GZCL' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', Begdate.DateTime))));
+    SQL.Add('exec P_View_DAY_GZCL' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', Begdate.Date))));
    open;
  end;

--- a/项目代码/RTBasicsV1/D01针织生产计划/U_DataLink.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_DataLink.dfm
@ -1,8 +1,6 @@
 inherited DataLink_KnitPlan: TDataLink_KnitPlan
  OldCreateOrder = True
  OnDestroy = DataModuleDestroy
-  Height = 406
-  Width = 599
  inherited cxEditStyleController1: TcxEditStyleController
    PixelsPerInch = 96
  end
@ -14,6 +12,9 @@ inherited DataLink_KnitPlan: TDataLink_KnitPlan
  end
  inherited ThreeColorBase: TcxStyleRepository
    PixelsPerInch = 96
+    inherited Default: TcxStyle
+      Font.Height = -14
+    end
  end
  inherited dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
    inherited dxLayoutSkinLookAndFeel1: TdxLayoutSkinLookAndFeel
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_DataLink.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_DataLink.pas
@ -1,11 +1,8 @@
 unit U_DataLink;
-
 interface
-
 uses
  SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
-  Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  U_BaseDataLink,
+  Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,U_BaseDataLink,
  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, dxSkinBasic,
  dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee,
  dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
@ -25,13 +22,11 @@ uses
  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue, dxCore, cxLocalization,
  dxLayoutLookAndFeels, cxImageList, cxGraphics, cxEdit, cxContainer,
  dxSkinsForm;
-
 type
  TMyThread = class(TThread)
  protected
    procedure Execute; override;
  end;
-
 var
  DConString: string;   {全局连接字符串}
  server, dtbase, user, pswd: string;  {数据库连接参数}
@ -54,7 +49,6 @@ var
  IpCall: Integer;
  IpWLDZStr: string;
  UserDataFlag: string;
-
 type
  TDataLink_KnitPlan = class(TBaseDataLink)
    AdoDataLink: TADOQuery;
@ -70,18 +64,13 @@ type
  public
    { Public declarations }
  end;
-
  TMakebar = procedure(ucData: pchar; nDataLen: integer; nErrLevel: integer; nMask: integer; nBarEdition: integer; szBmpFileName: pchar; nScale: integer); stdcall;
-
  TMixtext = procedure(szSrcBmpFileName: PChar; szDstBmpFileName: PChar; sztext: PChar; fontsize, txtheight, hmargin, vmargin, txtcntoneline: integer); stdcall;
-
 var
  DataLink_KnitPlan: TDataLink_KnitPlan;
  CriticalSection: TCriticalSection; {声明临界}
-
 implementation
 {$R *.dfm}
-
 procedure TMyThread.Execute;
 begin
  FreeOnTerminate := True;
@ -104,29 +93,23 @@ begin
        Connected := true;
      end;
    except
-
    end;
  end;
  CriticalSection.Leave;
 end;
-
 procedure TDataLink_KnitPlan.DataModuleDestroy(Sender: TObject);
 begin
  inherited;
  CriticalSection.Free;
  DataLink_KnitPlan := nil;
 end;
-
 procedure TDataLink_KnitPlan.Timer_linkTimer(Sender: TObject);
 begin
  TMyThread.Create(False);
 end;
-
 procedure TDataLink_KnitPlan.DataModuleCreate(Sender: TObject);
 begin
  inherited;
  CriticalSection := TCriticalSection.Create;
 end;
-
 end.
-
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_GetDllForm.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_GetDllForm.pas
@ -70,10 +70,10 @@ begin

  if trim(DataBaseStr) = '' then
  begin
-    server := '101.132.143.144,7781';
+    server := '127.0.0.1';
    dtbase := 'RTBasicsData';
-    user := 'rtsa';
-    pswd := 'rightsoft@5740';
+    user := 'sa';
+    pswd := 'rightsoft';
    DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
    DParameters1 := '¹ÜÀí';
  end
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitCardMachInPut.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitCardMachInPut.dfm
@ -81,60 +81,61 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
      Font.Style = [fsBold]
      ParentFont = False
    end
-    object edtName: TEdit
+    object edtName: TcxTextEdit
      Tag = 2
      Left = 374
      Top = 5
-      Width = 90
-      Height = 25
-      ReadOnly = True
+      AutoSize = False
+      ParentFont = False
      TabOrder = 0
-      OnChange = MCNOChange
+      Height = 25
+      Width = 90
    end
-    object edtCode: TEdit
+    object edtCode: TcxTextEdit
      Tag = 2
      Left = 215
      Top = 5
-      Width = 90
-      Height = 25
-      ReadOnly = True
+      AutoSize = False
+      ParentFont = False
      TabOrder = 1
-      OnChange = MCNOChange
+      Height = 25
+      Width = 90
    end
-    object edtConNo: TEdit
+    object edtConNo: TcxTextEdit
      Tag = 2
      Left = 63
      Top = 5
-      Width = 90
-      Height = 25
-      ReadOnly = True
+      AutoSize = False
+      ParentFont = False
      TabOrder = 2
-      OnChange = MCNOChange
+      Height = 25
+      Width = 90
    end
-    object edtWAPPS: TEdit
+    object edtWAPPS: TcxTextEdit
      Tag = 2
      Left = 700
      Top = 6
-      Width = 90
-      Height = 25
-      ReadOnly = True
+      AutoSize = False
+      ParentFont = False
      TabOrder = 3
-      OnChange = MCNOChange
+      Height = 25
+      Width = 90
    end
-    object edtYAPPS: TEdit
+    object edtYAPPS: TcxTextEdit
      Tag = 2
      Left = 537
      Top = 6
-      Width = 90
-      Height = 25
-      ReadOnly = True
+      AutoSize = False
+      ParentFont = False
      TabOrder = 4
-      OnChange = MCNOChange
+      Height = 25
+      Width = 90
    end
    object cxCheckBox1: TcxCheckBox
      Left = 847
      Top = 6
      Caption = #33258#21160#25171#21360#26631#31614
+      ParentFont = False
      Style.TransparentBorder = False
      TabOrder = 5
    end
@ -236,28 +237,23 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
        Font.Style = [fsBold]
        ParentFont = False
      end
-      object edtMachNo: TEdit
+      object edtMachNo: TcxTextEdit
        Tag = 2
        Left = 44
        Top = 6
-        Width = 108
-        Height = 24
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -16
-        Font.Name = #23435#20307
-        Font.Style = [fsBold]
+        AutoSize = False
        ParentFont = False
-        ReadOnly = True
        TabOrder = 0
+        Height = 25
+        Width = 108
      end
-      object edtCardQty: TEdit
+      object edtCardQty: TcxTextEdit
        Tag = 2
        Left = 247
        Top = 117
-        Width = 86
-        Height = 25
+        ParentFont = False
        TabOrder = 1
+        Width = 86
      end
      object Repairer: TBtnEditC
        Tag = 1
@ -270,14 +266,14 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
        OnBtnUpClick = RepairerBtnUpClick
        OnBtnDnClick = RepairerBtnDnClick
      end
-      object BatchNo: TEdit
+      object BatchNo: TcxTextEdit
        Tag = 2
        Left = 132
        Top = 114
-        Width = 53
-        Height = 25
+        ParentFont = False
        TabOrder = 3
        Visible = False
+        Width = 53
      end
      object isDY: TComboBox
        Left = 247
@ -292,20 +288,15 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
          #21542
          #26159)
      end
-      object Edit1: TEdit
+      object Edit1: TcxTextEdit
        Tag = 2
        Left = 211
        Top = 6
-        Width = 108
-        Height = 24
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -16
-        Font.Name = #23435#20307
-        Font.Style = [fsBold]
+        AutoSize = False
        ParentFont = False
-        ReadOnly = True
        TabOrder = 5
+        Height = 25
+        Width = 108
      end
      object Button3: TButton
        Left = 43
@ -331,17 +322,17 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
      Height = 37
      Align = alClient
      AutoSize = True
-      ButtonHeight = 38
-      ButtonWidth = 91
+      ButtonHeight = 30
+      ButtonWidth = 83
      Caption = 'ToolBar1'
      Color = clSkyBlue
-      DisabledImages = DataLink_KnitPlan.ImageList_new32
+      DisabledImages = DataLink_KnitPlan.cxImageList_bar
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -12
      Font.Name = #23435#20307
      Font.Style = []
-      Images = DataLink_KnitPlan.ImageList_new32
+      Images = DataLink_KnitPlan.cxImageList_bar
      List = True
      ParentColor = False
      ParentFont = False
@ -356,7 +347,7 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
        OnClick = ToolButton1Click
      end
      object ToolButton2: TToolButton
-        Left = 71
+        Left = 63
        Top = 0
        AutoSize = True
        Caption = #25377#36710#24037
@ -364,7 +355,7 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
        OnClick = ToolButton2Click
      end
      object ToolButton3: TToolButton
-        Left = 154
+        Left = 138
        Top = 0
        AutoSize = True
        Caption = #25171#21360' '
@ -372,7 +363,7 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
        OnClick = ToolButton3Click
      end
      object ToolButton12: TToolButton
-        Left = 231
+        Left = 205
        Top = 0
        AutoSize = True
        Caption = #20445#23384#26684#24335
@ -380,7 +371,7 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
        OnClick = ToolButton12Click
      end
      object TBClose: TToolButton
-        Left = 326
+        Left = 292
        Top = 0
        AutoSize = True
        Caption = #20851#38381
@ -396,8 +387,6 @@ inherited frmKnitCardMachInPut: TfrmKnitCardMachInPut
    Height = 480
    Align = alClient
    TabOrder = 2
-    ExplicitLeft = 1
-    ExplicitTop = 72
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitCardMachInPut.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitCardMachInPut.pas
@ -37,11 +37,11 @@ type
    Label13: TLabel;
    Label21: TLabel;
    Label9: TLabel;
-    edtName: TEdit;
-    edtCode: TEdit;
-    edtConNo: TEdit;
-    edtWAPPS: TEdit;
-    edtYAPPS: TEdit;
+    edtName: TcxTextEdit;
+    edtCode: TcxTextEdit;
+    edtConNo: TcxTextEdit;
+    edtWAPPS: TcxTextEdit;
+    edtYAPPS: TcxTextEdit;
    Panel1: TPanel;
    Panel2: TPanel;
    Label10: TLabel;
@ -50,12 +50,12 @@ type
    Label8: TLabel;
    Label4: TLabel;
    Label2: TLabel;
-    edtMachNo: TEdit;
-    edtCardQty: TEdit;
+    edtMachNo: TcxTextEdit;
+    edtCardQty: TcxTextEdit;
    Repairer: TBtnEditC;
-    BatchNo: TEdit;
+    BatchNo: TcxTextEdit;
    isDY: TComboBox;
-    Edit1: TEdit;
+    Edit1: TcxTextEdit;
    ToolBar1: TToolBar;
    ToolButton1: TToolButton;
    ToolButton12: TToolButton;
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanCard.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanCard.dfm
@ -14,10 +14,10 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
    Left = 0
    Top = 0
    Width = 1397
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 83
    Caption = 'ToolBar1'
    Color = clSkyBlue
    DisabledImages = DataLink_KnitPlan.ImageList_new32
@ -26,7 +26,7 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
    Font.Height = -12
    Font.Name = #23435#20307
    Font.Style = []
-    Images = DataLink_KnitPlan.ImageList_new32
+    Images = DataLink_KnitPlan.cxImageList_bar
    List = True
    ParentColor = False
    ParentFont = False
@ -41,7 +41,7 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      OnClick = TBRafreshClick
    end
    object ToolButton3: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #24067#31080#23433#25490
@ -49,7 +49,7 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      OnClick = ToolButton3Click
    end
    object ToolButton4: TToolButton
-      Left = 166
+      Left = 150
      Top = 0
      AutoSize = True
      Caption = #21024#38500
@ -57,7 +57,7 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      OnClick = ToolButton4Click
    end
    object ToolButton5: TToolButton
-      Left = 237
+      Left = 213
      Top = 0
      AutoSize = True
      Caption = #21024#38500#26085#24535
@ -65,7 +65,7 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      OnClick = ToolButton5Click
    end
    object ToolButton1: TToolButton
-      Left = 332
+      Left = 300
      Top = 0
      AutoSize = True
      Caption = #25171#21360
@ -73,7 +73,7 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      OnClick = ToolButton1Click
    end
    object ToolButton2: TToolButton
-      Left = 403
+      Left = 363
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -81,7 +81,7 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      OnClick = ToolButton2Click
    end
    object TBClose: TToolButton
-      Left = 498
+      Left = 450
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -91,18 +91,19 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
  end
  object Panel1: TPanel [1]
    Left = 0
-    Top = 38
+    Top = 30
    Width = 1397
-    Height = 67
+    Height = 103
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
+    ExplicitLeft = -1
    object Label3: TLabel
-      Left = 193
-      Top = 12
+      Left = 32
+      Top = 51
      Width = 39
      Height = 12
      Caption = #21512#21516#21495
@ -114,8 +115,8 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      ParentFont = False
    end
    object Label1: TLabel
-      Left = 561
-      Top = 12
+      Left = 400
+      Top = 51
      Width = 53
      Height = 12
      Caption = #26426' '#21488' '#21495
@ -127,8 +128,8 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      ParentFont = False
    end
    object Label2: TLabel
-      Left = 379
-      Top = 38
+      Left = 218
+      Top = 77
      Width = 52
      Height = 12
      Caption = #20135#21697#21517#31216
@ -140,8 +141,8 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      ParentFont = False
    end
    object Label4: TLabel
-      Left = 180
-      Top = 38
+      Left = 19
+      Top = 77
      Width = 52
      Height = 12
      Caption = #20135#21697#32534#21495
@ -153,8 +154,8 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      ParentFont = False
    end
    object Label5: TLabel
-      Left = 377
-      Top = 12
+      Left = 216
+      Top = 51
      Width = 52
      Height = 12
      Caption = #29983#20135#21333#21495
@ -166,8 +167,8 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      ParentFont = False
    end
    object Label6: TLabel
-      Left = 560
-      Top = 38
+      Left = 399
+      Top = 77
      Width = 54
      Height = 12
      Caption = #25209'    '#21495
@ -178,29 +179,9 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      Font.Style = [fsBold]
      ParentFont = False
    end
-    object Label7: TLabel
-      Left = 22
-      Top = 12
-      Width = 52
-      Height = 12
-      Caption = #26597#35810#26085#26399
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-    end
-    object Label8: TLabel
-      Left = 56
-      Top = 38
-      Width = 15
-      Height = 17
-      Caption = '---'
-    end
    object Label9: TLabel
-      Left = 755
-      Top = 12
+      Left = 594
+      Top = 51
      Width = 54
      Height = 12
      Caption = #21345'    '#21495
@ -211,95 +192,111 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
      Font.Style = [fsBold]
      ParentFont = False
    end
-    object ConNo: TEdit
+    object ConNo: TcxTextEdit
      Tag = 2
-      Left = 234
-      Top = 8
-      Width = 100
-      Height = 25
+      Left = 72
+      Top = 49
+      AutoSize = False
+      ParentFont = False
      TabOrder = 0
-      OnChange = ConNoChange
-    end
-    object Loom: TEdit
-      Tag = 1
-      Left = 618
-      Top = 8
+      Height = 22
      Width = 100
-      Height = 25
+    end
+    object Loom: TcxTextEdit
+      Tag = 1
+      Left = 457
+      Top = 47
+      AutoSize = False
+      ParentFont = False
      TabOrder = 3
-      OnChange = ConNoChange
-    end
-    object C_Name: TEdit
-      Tag = 2
-      Left = 433
-      Top = 34
+      Height = 22
      Width = 100
-      Height = 25
+    end
+    object C_Name: TcxTextEdit
+      Tag = 2
+      Left = 272
+      Top = 73
+      AutoSize = False
+      ParentFont = False
      TabOrder = 1
-      OnChange = ConNoChange
-    end
-    object C_Code: TEdit
-      Tag = 2
-      Left = 234
-      Top = 34
+      Height = 22
      Width = 100
-      Height = 25
+    end
+    object C_Code: TcxTextEdit
+      Tag = 2
+      Left = 73
+      Top = 73
+      AutoSize = False
+      ParentFont = False
      TabOrder = 2
-      OnChange = ConNoChange
-    end
-    object OrderNo: TEdit
-      Tag = 2
-      Left = 433
-      Top = 8
+      Height = 22
      Width = 100
-      Height = 25
+    end
+    object OrderNo: TcxTextEdit
+      Tag = 2
+      Left = 272
+      Top = 47
+      AutoSize = False
+      ParentFont = False
      TabOrder = 4
-      OnChange = ConNoChange
+      Height = 22
+      Width = 100
    end
-    object BatchNo: TEdit
+    object BatchNo: TcxTextEdit
      Tag = 1
-      Left = 618
-      Top = 34
-      Width = 100
-      Height = 25
+      Left = 457
+      Top = 73
+      AutoSize = False
+      ParentFont = False
      TabOrder = 5
-      OnChange = ConNoChange
-    end
-    object BegDate: TDateTimePicker
-      Left = 80
-      Top = 8
-      Width = 85
-      Height = 20
-      Date = 44378.000000000000000000
-      Format = 'yyyy-MM-dd'
-      Time = 0.464742650459811600
-      TabOrder = 6
-    end
-    object EndDate: TDateTimePicker
-      Left = 80
-      Top = 34
-      Width = 86
-      Height = 20
-      Date = 40675.000000000000000000
-      Format = 'yyyy-MM-dd'
-      Time = 0.464761099538009100
-      TabOrder = 7
-    end
-    object PCID: TEdit
-      Tag = 2
-      Left = 811
-      Top = 8
+      Height = 22
      Width = 100
-      Height = 25
-      TabOrder = 8
-      OnChange = ConNoChange
+    end
+    object PCID: TcxTextEdit
+      Tag = 2
+      Left = 650
+      Top = 47
+      AutoSize = False
+      ParentFont = False
+      TabOrder = 6
+      Height = 22
+      Width = 100
+    end
+    inline frmFrameDateSel: TfrmFrameDateSel
+      Left = -1
+      Top = 1
+      Width = 1078
+      Height = 37
+      Color = clWhite
+      ParentBackground = False
+      ParentColor = False
+      TabOrder = 7
+      ExplicitLeft = -1
+      ExplicitTop = 1
+      inherited BegDate: TcxDateEdit
+        Left = 92
+        ExplicitLeft = 92
+        ExplicitHeight = 33
+      end
+      inherited EndDate: TcxDateEdit
+        Left = 233
+        ExplicitLeft = 233
+        ExplicitHeight = 33
+      end
+      inherited cxButton3: TcxButton
+        Top = 2
+        ExplicitTop = 2
+      end
+      inherited cbbType: TcxComboBox
+        ExplicitHeight = 33
+      end
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
-    Top = 132
+    Top = 160
    Width = 1397
-    Height = 505
+    Height = 477
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
@ -475,7 +472,7 @@ inherited frmKnitPlanCard: TfrmKnitPlanCard
  end
  object cxTabControl1: TcxTabControl [3]
    Left = 0
-    Top = 105
+    Top = 133
    Width = 1397
    Height = 27
    Align = alTop
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanCard.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanCard.pas
@ -28,7 +28,7 @@ uses
  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
-  dxSkinXmas2008Blue, dxScrollbarAnnotations;
+  dxSkinXmas2008Blue, dxScrollbarAnnotations, cxContainer, FrameDateSel;

 type
  TfrmKnitPlanCard = class(TfrmBaseList)
@ -41,9 +41,9 @@ type
    ADOQueryMain: TADOQuery;
    ADOQueryTemp: TADOQuery;
    Label3: TLabel;
-    ConNo: TEdit;
+    ConNo: TcxTextEdit;
    ADOQueryPrint: TADOQuery;
-    Loom: TEdit;
+    Loom: TcxTextEdit;
    Label1: TLabel;
    cxGrid1: TcxGrid;
    Tv1: TcxGridDBTableView;
@ -51,11 +51,11 @@ type
    v3Column1: TcxGridDBColumn;
    v3Column2: TcxGridDBColumn;
    Label2: TLabel;
-    C_Name: TEdit;
+    C_Name: TcxTextEdit;
    DS_1: TDataSource;
    CDS_1: TClientDataSet;
    Label4: TLabel;
-    C_Code: TEdit;
+    C_Code: TcxTextEdit;
    v3Column6: TcxGridDBColumn;
    v3Column8: TcxGridDBColumn;
    v3Column14: TcxGridDBColumn;
@ -73,10 +73,10 @@ type
    Tv1Column7: TcxGridDBColumn;
    Tv1Column8: TcxGridDBColumn;
    Label5: TLabel;
-    OrderNo: TEdit;
+    OrderNo: TcxTextEdit;
    Tv1Column9: TcxGridDBColumn;
    Label6: TLabel;
-    BatchNo: TEdit;
+    BatchNo: TcxTextEdit;
    PopupMenu1: TPopupMenu;
    N1: TMenuItem;
    N2: TMenuItem;
@ -84,12 +84,9 @@ type
    ToolButton4: TToolButton;
    N3: TMenuItem;
    ToolButton5: TToolButton;
-    Label7: TLabel;
-    Label8: TLabel;
-    BegDate: TDateTimePicker;
-    EndDate: TDateTimePicker;
    Label9: TLabel;
-    PCID: TEdit;
+    PCID: TcxTextEdit;
+    frmFrameDateSel: TfrmFrameDateSel;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
@ -162,13 +159,13 @@ begin
        1:
          begin
            sql.Add(' and PRTCount>0');
-            sql.Add(' and A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''');
-            sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.DateTime + 1)) + '''');
+            sql.Add(' and A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.BegDate.Date)) + '''');
+            sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.EndDate.Date + 1)) + '''');
          end;
        2:
          begin
-            sql.Add(' and A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + '''');
-            sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.DateTime + 1)) + '''');
+            sql.Add(' and A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.BegDate.Date)) + '''');
+            sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.EndDate.Date + 1)) + '''');
          end;
      end;

@ -397,8 +394,8 @@ end;
 procedure TfrmKnitPlanCard.FormShow(Sender: TObject);
 begin
  inherited;
-  EndDate.DateTime := SGetServerDate(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 1;
+  frmFrameDateSel.EndDate.Date := SGetServerDate(ADOQueryTemp);
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel.EndDate.Date - 1;
  ReadCxGrid(trim(self.Caption), Tv1, 'Å÷²¼Éú²ú2');
  InitGrid();
 end;
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanInPut.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanInPut.dfm
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanInPut.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanInPut.pas
@ -12,7 +12,7 @@ uses
  StrUtils, cxPC, ShellAPI, cxCalendar, Math, cxLookAndFeels,
  cxLookAndFeelPainters, dxBarBuiltInMenu, cxNavigator, dxSkinsCore,
  dxSkinsDefaultPainters, dxDateRanges, U_BaseInput, System.ImageList,
-  Vcl.ImgList, Vcl.Menus, dxSkinWXI, dxScrollbarAnnotations;
+  Vcl.ImgList, Vcl.Menus, dxSkinWXI, dxScrollbarAnnotations, dxCore, cxDateUtils;

 type
  TfrmKnitPlanInPut = class(TfrmBaseInput)
@ -22,7 +22,6 @@ type
    ScrollBox1: TScrollBox;
    Label1: TLabel;
    Label2: TLabel;
-    OrdDate: TDateTimePicker;
    Label3: TLabel;
    Label11: TLabel;
    Label14: TLabel;
@ -34,13 +33,12 @@ type
    Label22: TLabel;
    ADOQueryCmd: TADOQuery;
    Label5: TLabel;
-    DlyDate: TDateTimePicker;
    Label8: TLabel;
    Label12: TLabel;
-    OrdPieceWeight: TEdit;
-    OrdPiece: TEdit;
+    OrdPieceWeight: TcxTextEdit;
+    OrdPiece: TcxTextEdit;
    Label13: TLabel;
-    OrdQty: TEdit;
+    OrdQty: TcxTextEdit;
    Label16: TLabel;
    cxPageControl1: TcxPageControl;
    cxTabSheet1: TcxTabSheet;
@ -64,7 +62,7 @@ type
    v2Column5: TcxGridDBColumn;
    v2Column6: TcxGridDBColumn;
    Label31: TLabel;
-    OrdPieceWeightRange: TEdit;
+    OrdPieceWeightRange: TcxTextEdit;
    Label37: TLabel;
    OrdSNote: TRichEdit;
    v2Column7: TcxGridDBColumn;
@ -74,9 +72,9 @@ type
    Label47: TLabel;
    Label33: TLabel;
    Label54: TLabel;
-    C_GramWeight: TEdit;
-    C_Width: TEdit;
-    C_Name: TEdit;
+    C_GramWeight: TcxTextEdit;
+    C_Width: TcxTextEdit;
+    C_Name: TcxTextEdit;
    Label43: TLabel;
    Label59: TLabel;
    YarnArrangement: TRichEdit;
@ -319,23 +317,14 @@ type
    v3Column146: TcxGridDBColumn;
    v2Column12: TcxGridDBColumn;
    lbl2: TLabel;
-    CustName: TBtnEditC;
-    MCType: TBtnEditC;
-    C_Code: TBtnEditC;
-    ConNo: TBtnEditC;
-    Saleser: TEdit;
-    OurCoName: TBtnEditC;
-    PacketNote: TBtnEditC;
-    Technics: TBtnEditC;
+    Saleser: TcxTextEdit;
    Label7: TLabel;
-    OrderNo: TEdit;
+    OrderNo: TcxTextEdit;
    C_Spec: TRichEdit;
    ToolBar3: TToolBar;
    ToolButton3: TToolButton;
    ToolButton4: TToolButton;
-    OrdType: TComboBox;
    Label4: TLabel;
-    FtyCoName: TBtnEditC;
    ToolButton8: TToolButton;
    PM_3: TPopupMenu;
    N1: TMenuItem;
@ -343,8 +332,8 @@ type
    PM_5: TPopupMenu;
    MenuItem1: TMenuItem;
    MenuItem2: TMenuItem;
-    ConMId: TEdit;
-    ConSId: TEdit;
+    ConMId: TcxTextEdit;
+    ConSId: TcxTextEdit;
    ToolButton1: TToolButton;
    Label6: TLabel;
    Label17: TLabel;
@ -352,67 +341,77 @@ type
    Label20: TLabel;
    Label10: TLabel;
    Label24: TLabel;
-    RuleBeforeTare: TEdit;
-    Coefficient: TEdit;
-    RuleLenUnit: TComboBox;
-    RuleLaterTare: TEdit;
-    AddWet: TEdit;
-    RuleConversion: TComboBox;
+    RuleBeforeTare: TcxTextEdit;
+    Coefficient: TcxTextEdit;
+    RuleLaterTare: TcxTextEdit;
+    AddWet: TcxTextEdit;
    Label15: TLabel;
-    BusinessType: TBtnEditC;
    Label19: TLabel;
    Label21: TLabel;
-    KJDate: TDateTimePicker;
-    ZJDate: TDateTimePicker;
    Label23: TLabel;
-    Looms: TEdit;
+    Looms: TcxTextEdit;
    Label25: TLabel;
    Label27: TLabel;
-    C_GPGramWeight: TEdit;
-    C_GPWidth: TEdit;
+    C_GPGramWeight: TcxTextEdit;
+    C_GPWidth: TcxTextEdit;
    Label28: TLabel;
-    C_BJWidth: TEdit;
+    C_BJWidth: TcxTextEdit;
    Label29: TLabel;
-    TotalStitches: TEdit;
+    TotalStitches: TcxTextEdit;
    Tv2Column1: TcxGridDBColumn;
-    NeedleShape: TBtnEditC;
    Tv2Column2: TcxGridDBColumn;
    Tv2Column3: TcxGridDBColumn;
    Tv2Column4: TcxGridDBColumn;
    Tv2Column5: TcxGridDBColumn;
    Tv2Column6: TcxGridDBColumn;
    Label32: TLabel;
-    PackType: TBtnEditC;
    Label34: TLabel;
-    TurnsQty: TEdit;
+    TurnsQty: TcxTextEdit;
    Label35: TLabel;
-    TurnsQtyAvg: TEdit;
+    TurnsQtyAvg: TcxTextEdit;
    Label36: TLabel;
    Label38: TLabel;
-    C_Composition: TEdit;
+    C_Composition: TcxTextEdit;
    Label39: TLabel;
-    C_Color: TEdit;
+    C_Color: TcxTextEdit;
    Label40: TLabel;
-    RollType: TEdit;
+    RollType: TcxTextEdit;
    Label42: TLabel;
-    PacketType: TEdit;
+    PacketType: TcxTextEdit;
    Label44: TLabel;
-    SendBack: TComboBox;
    Label45: TLabel;
-    C_Type: TEdit;
+    C_Type: TcxTextEdit;
    Label46: TLabel;
    Label48: TLabel;
-    Price: TEdit;
-    Workshop: TComboBox;
+    Price: TcxTextEdit;
    Label49: TLabel;
    YarnLength: TRichEdit;
    Label50: TLabel;
-    SellType: TBtnEditC;
    Label30: TLabel;
-    Strain: TBtnEditC;
    ToolButton2: TToolButton;
+    Workshop: TcxComboBox;
+    CustName: TcxButtonEdit;
+    ConNo: TcxButtonEdit;
+    C_Code: TcxButtonEdit;
+    NeedleShape: TcxButtonEdit;
+    MCType: TcxButtonEdit;
+    SellType: TcxButtonEdit;
+    PacketNote: TcxButtonEdit;
+    Strain: TcxButtonEdit;
+    PackType: TcxButtonEdit;
    Repairer: TcxButtonEdit;
-    OrdNote: TcxMemo;
+    OurCoName: TcxButtonEdit;
+    FtyCoName: TcxButtonEdit;
+    BusinessType: TcxButtonEdit;
+    Technics: TcxButtonEdit;
+    OrdType: TcxComboBox;
+    RuleLenUnit: TcxComboBox;
+    RuleConversion: TcxComboBox;
+    SendBack: TcxComboBox;
+    DlyDate: TcxDateEdit;
+    OrdDate: TcxDateEdit;
+    ZJDate: TcxDateEdit;
+    KJDate: TcxDateEdit;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
@ -422,15 +421,7 @@ type
    procedure Tv5MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
    procedure v2Column11PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
    procedure OrdPieceChange(Sender: TObject);
-    procedure C_CodeKeyPress(Sender: TObject; var Key: Char);
-    procedure ConNoKeyPress(Sender: TObject; var Key: Char);
-    procedure MCTypeBtnUpClick(Sender: TObject);
-    procedure CustNameBtnUpClick(Sender: TObject);
-    procedure C_CodeBtnUpClick(Sender: TObject);
-    procedure ConNoBtnUpClick(Sender: TObject);
-    procedure CustNameBtnDnClick(Sender: TObject);
-    procedure OurCoNameBtnUpClick(Sender: TObject);
-    procedure FtyCoNameBtnUpClick(Sender: TObject);
+    procedure CustName1BtnDnClick(Sender: TObject);
    procedure N1Click(Sender: TObject);
    procedure N2Click(Sender: TObject);
    procedure MenuItem1Click(Sender: TObject);
@ -438,8 +429,16 @@ type
    procedure ToolButton1Click(Sender: TObject);
    procedure ToolButton2Click(Sender: TObject);
    procedure OrdPieceWeightExit(Sender: TObject);
-    procedure RepairerDblClick(Sender: TObject);
-    procedure FollowerPropertiesButtonClick(Sender: TObject;
+    procedure CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure FtyCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure OurCoNamePropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure RepairerPropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure ConNoPropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure C_CodePropertiesChange(Sender: TObject);
+    procedure C_CodePropertiesButtonClick(Sender: TObject;
      AButtonIndex: Integer);
  private
    FXS, FGridFlag: Integer;
@ -463,7 +462,6 @@ implementation
 uses
  U_DataLink, U_ZDYHelp, U_RTFun, U_KnitClothInfoSel, U_CompanySel,
  U_YarnInfoSel, U_KnitSalesContractSel;
-
 {$R *.dfm}

 procedure TfrmKnitPlanInPut.InitClothYarn(MC_Code: string);
@ -548,9 +546,12 @@ begin
  end;

  SCSHData(ADOQueryTemp, ScrollBox1, 0);
-  CustName.TxtCode := ADOQueryTemp.FieldByName('CustNo').AsString;
-  FtyCoName.TxtCode := ADOQueryTemp.FieldByName('FtyCoNo').AsString;
-  OurCoName.TxtCode := ADOQueryTemp.FieldByName('OurCoNo').AsString;
+  //CustName.TxtCode := ADOQueryTemp.FieldByName('CustNo').AsString;
+  CustName.Properties.LookupItems.Text := ADOQueryTemp.FieldByName('CustNo').AsString;
+  //FtyCoName.TxtCode := ADOQueryTemp.FieldByName('FtyCoNo').AsString;
+  FtyCoName.Properties.LookupItems.Text := ADOQueryTemp.FieldByName('FtyCoNo').AsString;
+  //OurCoName.TxtCode := ADOQueryTemp.FieldByName( 'OurCoNo').AsString;
+  OurCoName.Properties.LookupItems.Text := ADOQueryTemp.FieldByName('OurCoNo').AsString;

  with ADOQueryTemp do
  begin
@ -625,9 +626,9 @@ begin
      sql.Add('select Top 1* from knit_Plan_Main order by FillTime desc ');
      Open;
    end;
-    OrdDate.DateTime := SGetServerDate(ADOQueryTemp);
-    OrdDate.Checked := True;
-    DlyDate.Date := OrdDate.DateTime;
+    OrdDate.Date := SGetServerDate(ADOQueryTemp);
+    //OrdDate.Checked := True;
+    DlyDate.Date := OrdDate.Date;
  end;

  if FCopyInt = 1 then
@ -685,42 +686,30 @@ begin

 end;

-procedure TfrmKnitPlanInPut.RepairerDblClick(Sender: TObject);
-begin
-  TcxButtonEdit(Sender).Text := '';
-  TcxButtonEdit(Sender).Properties.LookupItems.Text := '';
-end;
-
-procedure TfrmKnitPlanInPut.FollowerPropertiesButtonClick(Sender: TObject;
-  AButtonIndex: Integer);
-var
-  fsj: string;
-  FWZ: Integer;
-begin
-  fsj := Trim(TcxButtonEdit(Sender).Hint);
-  FWZ := Pos('/', fsj);
-  try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
-    with frmZDYHelp do
-    begin
-      flag := Copy(fsj, 1, FWZ - 1);
-      flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
-      if ShowModal = 1 then
-      begin
-        TcxButtonEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-      end;
-    end;
-  finally
-    frmZDYHelp.Free;
-  end;
-
-end;
-
 procedure TfrmKnitPlanInPut.FormShow(Sender: TObject);
 begin
  InitData();
 end;

+procedure TfrmKnitPlanInPut.FtyCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmCompanySel := TfrmCompanySel.Create(Application);
+    with frmCompanySel do
+    begin
+      FCoType := '¹©Ó¦ÉÌ';
+      if ShowModal = 1 then
+      begin
+        //FtyCoName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        FtyCoName.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        FtyCoName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
+      end;
+    end;
+  finally
+    frmCompanySel.Free;
+  end;
+end;
+
 function TfrmKnitPlanInPut.SaveData(): Boolean;
 var
  maxno, maxsubno, maxpbno, maxpzno, maxsjno: string;
@ -766,9 +755,13 @@ begin
      FieldByName('MainId').Value := Trim(maxno);
      RTSetsavedata(ADOQueryCmd, 'knit_Plan_Main', ScrollBox1, 0);

-      FieldByName('CustNo').Value := CustName.TxtCode;
-      FieldByName('FtyCoNo').Value := FtyCoName.TxtCode;
-      FieldByName('OurCoNo').Value := OurCoName.TxtCode;
+      //FieldByName('CustNo').Value := CustName.TxtCode;
+      FieldByName('CustNo').Value := Trim(CustName.Properties.LookupItems.Text);
+      //FieldByName('FtyCoNo').Value := FtyCoName.TxtCode;
+      FieldByName('FtyCoNo').Value := FtyCoName.Properties.LookupItems.Text;
+      //FieldByName('OurCoNo').Value := OurCoName.TxtCode;
+      FieldByName('OurCoNo').Value := OurCoName.Properties.LookupItems.Text;
+
      Post;
    end;
 //////////////////////////            保存主表              //////////////////////////
@ -1215,7 +1208,8 @@ begin
  end;
 end;

-procedure TfrmKnitPlanInPut.OurCoNameBtnUpClick(Sender: TObject);
+procedure TfrmKnitPlanInPut.OurCoNamePropertiesButtonClick(Sender: TObject;
+  AButtonIndex: Integer);
 begin
  try
    frmCompanySel := TfrmCompanySel.Create(Application);
@ -1224,15 +1218,43 @@ begin
      FCoType := '我司';
      if ShowModal = 1 then
      begin
-        OurCoName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        //OurCoName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        OurCoName.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('CoCode').AsString);
        OurCoName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
-        FtyCoName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        //FtyCoName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        FtyCoName.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('CoCode').AsString);
        FtyCoName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
      end;
    end;
  finally
    frmCompanySel.Free;
  end;
+end;
+
+procedure TfrmKnitPlanInPut.RepairerPropertiesButtonClick(Sender: TObject;
+  AButtonIndex: Integer);
+var
+  fsj: string;
+  FWZ: Integer;
+begin
+  fsj := Trim(TBtnEditC(Sender).Hint);
+
+  FWZ := Pos('/', fsj);
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      flag := Copy(fsj, 1, FWZ - 1);
+      flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
+
+      if ShowModal = 1 then
+      begin
+        TBtnEditC(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+      end;
+    end;
+  finally
+    frmZDYHelp.Free;
+  end;

 end;

@ -1258,41 +1280,6 @@ begin
    OrdPiece.Text := IntToStr(Ceil(FOrdQty / FOrdPieceWeight));
 end;

-procedure TfrmKnitPlanInPut.C_CodeKeyPress(Sender: TObject; var Key: Char);
-begin
-  if Key = #13 then
-  begin
-    Key := #0;
-    SelectNext(ActiveControl as TWinControl, True, True);
-  end;
-end;
-
-procedure TfrmKnitPlanInPut.MCTypeBtnUpClick(Sender: TObject);
-var
-  fsj: string;
-  FWZ: Integer;
-begin
-  fsj := Trim(TBtnEditC(Sender).Hint);
-
-  FWZ := Pos('/', fsj);
-  try
-    frmZDYHelp := TfrmZDYHelp.Create(Application);
-    with frmZDYHelp do
-    begin
-      flag := Copy(fsj, 1, FWZ - 1);
-      flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
-
-      if ShowModal = 1 then
-      begin
-        TBtnEditC(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
-      end;
-    end;
-  finally
-    frmZDYHelp.Free;
-  end;
-
-end;
-
 procedure TfrmKnitPlanInPut.MenuItem1Click(Sender: TObject);
 begin
  with ClientDataSet5 do
@ -1343,35 +1330,55 @@ begin
  ClientDataSet3.Delete;
 end;

-procedure TfrmKnitPlanInPut.ConNoKeyPress(Sender: TObject; var Key: Char);
-begin
-  if Key = #13 then
-  begin
-    Key := #0;
-    SelectNext(ActiveControl as TWinControl, True, True);
-  end;
-end;
-
-procedure TfrmKnitPlanInPut.FtyCoNameBtnUpClick(Sender: TObject);
+procedure TfrmKnitPlanInPut.C_CodePropertiesButtonClick(Sender: TObject;
+  AButtonIndex: Integer);
 begin
 try
-    frmCompanySel := TfrmCompanySel.Create(Application);
-    with frmCompanySel do
+    frmKnitClothInfoSel := TfrmKnitClothInfoSel.Create(Application);
+    with frmKnitClothInfoSel do
    begin
-      FCoType := '¹©Ó¦ÉÌ';
      if ShowModal = 1 then
      begin
-        FtyCoName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
-        FtyCoName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
+        Self.C_Code.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Code').AsString;
+        Self.C_Name.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Name').AsString;
+        Self.C_Spec.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Spec').AsString;
+        Self.C_Width.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Width').AsString;
+        Self.C_GramWeight.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_GramWeight').AsString;
+        Self.C_Composition.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Composition').AsString;
+        Self.C_Type.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('CTName').AsString;
      end;
    end;
  finally
-    frmCompanySel.Free;
+    frmKnitClothInfoSel.Free;
  end;
 end;

-procedure TfrmKnitPlanInPut.ConNoBtnUpClick(Sender: TObject);
+procedure TfrmKnitPlanInPut.C_CodePropertiesChange(Sender: TObject);
 begin
+ try
+    frmKnitClothInfoSel := TfrmKnitClothInfoSel.Create(Application);
+    with frmKnitClothInfoSel do
+    begin
+      if ShowModal = 1 then
+      begin
+        Self.C_Code.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Code').AsString;
+        Self.C_Name.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Name').AsString;
+        Self.C_Spec.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Spec').AsString;
+        Self.C_Width.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Width').AsString;
+        Self.C_GramWeight.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_GramWeight').AsString;
+        Self.C_Composition.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Composition').AsString;
+        Self.C_Type.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('CTName').AsString;
+      end;
+    end;
+  finally
+    frmKnitClothInfoSel.Free;
+  end;
+end;
+
+procedure TfrmKnitPlanInPut.ConNoPropertiesButtonClick(Sender: TObject;
+  AButtonIndex: Integer);
+begin
+  inherited;
 try
    frmKnitSalesContractSel := TfrmKnitSalesContractSel.Create(Application);
    with frmKnitSalesContractSel do
@ -1379,8 +1386,10 @@ begin
      if ShowModal = 1 then
      begin
        self.ConNo.Text := frmKnitSalesContractSel.CDS_1.fieldbyname('ConNo').AsString; //合同号
-        self.Custname.Text := frmKnitSalesContractSel.CDS_1.fieldbyname('BuyName').AsString; //¿Í»§
-        self.Custname.TxtCode := frmKnitSalesContractSel.CDS_1.fieldbyname('BuyNo').AsString; //¿Í»§
+        //self.Custname.Text := frmKnitSalesContractSel.CDS_1.fieldbyname('BuyName').AsString; //¿Í»§
+        //self.Custname.TxtCode := frmKnitSalesContractSel.CDS_1.fieldbyname('BuyNo').AsString; //¿Í»§
+        self.Custname.Properties.LookupItems.Text := frmKnitSalesContractSel.CDS_1.fieldbyname('BuyName').AsString;
+        self.Custname.Text := frmKnitSalesContractSel.CDS_1.fieldbyname('BuyNo').AsString;

        self.Saleser.Text := frmKnitSalesContractSel.CDS_1.fieldbyname('Saleser').AsString; //下单员
        self.ConMId.Text := frmKnitSalesContractSel.CDS_1.fieldbyname('ConMId').AsString; //ConMainId
@ -1404,35 +1413,13 @@ begin

 end;

-procedure TfrmKnitPlanInPut.C_CodeBtnUpClick(Sender: TObject);
-begin
-  try
-    frmKnitClothInfoSel := TfrmKnitClothInfoSel.Create(Application);
-    with frmKnitClothInfoSel do
-    begin
-      if ShowModal = 1 then
-      begin
-        Self.C_Code.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Code').AsString;
-        Self.C_Name.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Name').AsString;
-        Self.C_Spec.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Spec').AsString;
-        Self.C_Width.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Width').AsString;
-        Self.C_GramWeight.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_GramWeight').AsString;
-        Self.C_Composition.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('C_Composition').AsString;
-        Self.C_Type.Text := frmKnitClothInfoSel.CDS_1.fieldbyname('CTName').AsString;
-      end;
-    end;
-  finally
-    frmKnitClothInfoSel.Free;
-  end;
-end;
-
-procedure TfrmKnitPlanInPut.CustNameBtnDnClick(Sender: TObject);
+procedure TfrmKnitPlanInPut.CustName1BtnDnClick(Sender: TObject);
 begin
  TBtnEditC(Sender).TxtCode := '';
  TBtnEditC(Sender).Text := '';
 end;

-procedure TfrmKnitPlanInPut.CustNameBtnUpClick(Sender: TObject);
+procedure TfrmKnitPlanInPut.CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
  try
    frmCompanySel := TfrmCompanySel.Create(Application);
@ -1441,14 +1428,13 @@ begin
      FCoType := '客户';
      if ShowModal = 1 then
      begin
-        CustName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        CustName.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('CoCode').AsString);
        CustName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
      end;
    end;
  finally
    frmCompanySel.Free;
  end;
-
 end;

 end.
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanInPut.vlb
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanInPut.vlb
@ -0,0 +1,877 @@
+[cxGridDBColumn53]
+Coordinates=940,232,128,36
+
+[v3Column72]
+Coordinates=940,287,86,36
+
+[v3Column30]
+Coordinates=940,342,86,36
+
+[v3Column125]
+Coordinates=940,397,94,36
+
+[cxPageControl1]
+Coordinates=102,554,106,36
+
+[v3Column81]
+Coordinates=940,507,86,36
+
+[cxGridDBColumn115]
+Coordinates=940,562,135,36
+
+[cxGridDBColumn97]
+Coordinates=940,672,128,36
+
+[cxGridDBColumn57]
+Coordinates=921,721,128,36
+
+[cxGridDBColumn89]
+Coordinates=1170,1,128,36
+
+[cxGridDBColumn67]
+Coordinates=1170,56,128,36
+
+[N2]
+Coordinates=230,527,40,36
+
+[ToolButton3]
+Coordinates=1048,508,84,36
+
+[cxGridDBColumn40]
+Coordinates=1170,111,128,36
+
+[PM_3]
+Coordinates=921,817,48,36
+
+[v3Column36]
+Coordinates=832,817,86,36
+
+[v3Column130]
+Coordinates=733,817,94,36
+
+[cxGridLevel2]
+Coordinates=565,817,90,36
+
+[v3Column67]
+Coordinates=476,817,86,36
+
+[v3Column140]
+Coordinates=377,817,94,36
+
+[ToolBar3]
+Coordinates=825,508,67,36
+
+[cxGridDBColumn46]
+Coordinates=1170,166,128,36
+
+[v3Column20]
+Coordinates=81,817,86,36
+
+[cxGridDBColumn44]
+Coordinates=1170,221,128,36
+
+[cxGridDBColumn62]
+Coordinates=1170,276,128,36
+
+[cxGridDBColumn34]
+Coordinates=1170,331,128,36
+
+[v3Column70]
+Coordinates=1170,386,86,36
+
+[Tv2Column3]
+Coordinates=1170,441,87,36
+
+[v3Column13]
+Coordinates=1170,496,86,36
+
+[v2Column7]
+Coordinates=0,781,79,36
+
+[ToolButton1]
+Coordinates=580,508,84,36
+
+[cxGridDBColumn106]
+Coordinates=1170,661,135,36
+
+[cxGridDBColumn52]
+Coordinates=1170,716,128,36
+
+[v3Column114]
+Coordinates=1170,771,94,36
+
+[Tv2Column5]
+Coordinates=1170,826,87,36
+
+[v3Column69]
+Coordinates=1170,881,86,36
+
+[v3Column101]
+Coordinates=1071,891,94,36
+
+[v2Column2]
+Coordinates=982,891,79,36
+
+[N1]
+Coordinates=181,527,40,36
+
+[cxGrid2]
+Coordinates=511,508,59,36
+
+[ADOQueryBaseTemp]
+Coordinates=425,212,139,58
+
+[v3Column37]
+Coordinates=824,891,86,36
+
+[v3Column2]
+Coordinates=735,891,79,36
+
+[cxGridDBColumn56]
+Coordinates=1041,817,128,36
+
+[v3Column64]
+Coordinates=567,891,86,36
+
+[v3Column73]
+Coordinates=478,891,86,36
+
+[v2Column5]
+Coordinates=389,891,79,36
+
+[v3Column110]
+Coordinates=290,891,94,36
+
+[cxGridDBColumn86]
+Coordinates=1343,1,128,36
+
+[v3Column108]
+Coordinates=191,891,94,36
+
+[v3Column27]
+Coordinates=102,891,86,36
+
+[v3Column107]
+Coordinates=0,855,94,36
+
+[ADOQueryCmd]
+Coordinates=80,144,104,58
+
+[v3Column97]
+Coordinates=1343,111,86,36
+
+[v3Column34]
+Coordinates=1343,166,86,36
+
+[v3Column145]
+Coordinates=1343,276,94,36
+
+[ToolBar1]
+Coordinates=136,508,67,36
+
+[Tv2Column2]
+Coordinates=1343,386,87,36
+
+[v3Column55]
+Coordinates=1343,496,86,36
+
+[cxGridDBColumn61]
+Coordinates=1343,551,128,36
+
+[v3Column133]
+Coordinates=1343,606,94,36
+
+[v2Column4]
+Coordinates=1343,661,79,36
+
+[v3Column121]
+Coordinates=1343,716,94,36
+
+[v3Column137]
+Coordinates=1343,771,94,36
+
+[v3Column56]
+Coordinates=1343,826,86,36
+
+[v3Column43]
+Coordinates=1343,881,86,36
+
+[v3Column143]
+Coordinates=1343,936,94,36
+
+[cxGridDBColumn112]
+Coordinates=1509,56,135,36
+
+[cxGridDBColumn113]
+Coordinates=1509,111,135,36
+
+[v3Column126]
+Coordinates=1244,965,94,36
+
+[cxGridDBColumn50]
+Coordinates=1509,166,128,36
+
+[cxGridDBColumn43]
+Coordinates=1509,221,128,36
+
+[v3Column109]
+Coordinates=1046,965,94,36
+
+[v3Column28]
+Coordinates=957,965,86,36
+
+[Tv2Column6]
+Coordinates=799,965,87,36
+
+[cxGridDBColumn32]
+Coordinates=1509,331,128,36
+
+[v2Column10]
+Coordinates=641,965,86,36
+
+[Tv2Column1]
+Coordinates=552,965,87,36
+
+[v3Column134]
+Coordinates=453,965,94,36
+
+[cxGridDBColumn95]
+Coordinates=1509,386,128,36
+
+[v3Column10]
+Coordinates=206,965,86,36
+
+[v3Column68]
+Coordinates=117,965,86,36
+
+[v2Column8]
+Coordinates=28,965,79,36
+
+[v3Column141]
+Coordinates=1509,441,94,36
+
+[v3Column74]
+Coordinates=1509,496,86,36
+
+[cxGridDBColumn47]
+Coordinates=1509,551,128,36
+
+[cxGridDBColumn119]
+Coordinates=1509,606,135,36
+
+[TBClose]
+Coordinates=424,462,64,36
+
+[v3Column35]
+Coordinates=1509,716,86,36
+
+[v3Column33]
+Coordinates=1509,771,86,36
+
+[cxGridDBColumn72]
+Coordinates=1509,826,128,36
+
+[v3Column84]
+Coordinates=1509,881,86,36
+
+[cxGridDBColumn63]
+Coordinates=1509,991,128,36
+
+[v3Column45]
+Coordinates=1401,1039,86,36
+
+[cxGridDBColumn109]
+Coordinates=1193,1010,135,36
+
+[v3Column46]
+Coordinates=1104,1039,86,36
+
+[v3Column52]
+Coordinates=1015,1039,86,36
+
+[cxGridDBColumn102]
+Coordinates=787,1010,135,36
+
+[cxGridDBColumn103]
+Coordinates=648,1010,135,36
+
+[ADOQueryBaseCmd]
+Coordinates=1106,212,133,58
+
+[v3Column50]
+Coordinates=470,1039,86,36
+
+[v3Column19]
+Coordinates=381,1039,86,36
+
+[v3Column120]
+Coordinates=282,1039,94,36
+
+[cxGridDBColumn49]
+Coordinates=153,1010,128,36
+
+[v3Column127]
+Coordinates=54,1039,94,36
+
+[v3Column91]
+Coordinates=1682,1,86,36
+
+[v3Column9]
+Coordinates=1682,56,79,36
+
+[v3Column57]
+Coordinates=1682,111,86,36
+
+[cxGridDBColumn101]
+Coordinates=1682,276,135,36
+
+[cxGridDBColumn51]
+Coordinates=1682,331,128,36
+
+[cxTabSheet1]
+Coordinates=830,416,90,36
+
+[Panel3]
+Coordinates=80,280,55,58
+
+[cxGridDBColumn104]
+Coordinates=1682,441,135,36
+
+[cxGridDBColumn91]
+Coordinates=1682,551,128,36
+
+[v3Column4]
+Coordinates=1682,606,79,36
+
+[cxGridDBColumn94]
+Coordinates=1682,661,128,36
+
+[DataSource5]
+Coordinates=666,540,89,36
+
+[v3Column85]
+Coordinates=1682,716,86,36
+
+[cxGridDBColumn6]
+Coordinates=1682,771,121,36
+
+[cxGridDBColumn71]
+Coordinates=1682,826,128,36
+
+[v3Column8]
+Coordinates=1682,881,79,36
+
+[DataSource3]
+Coordinates=666,386,89,36
+
+[v3Column51]
+Coordinates=1682,936,86,36
+
+[v3Column24]
+Coordinates=1682,991,86,36
+
+[cxGrid5]
+Coordinates=659,416,59,36
+
+[MenuItem1]
+Coordinates=1682,1101,79,36
+
+[v3Column139]
+Coordinates=1583,1113,94,36
+
+[v3Column26]
+Coordinates=1494,1113,86,36
+
+[TV5]
+Coordinates=132,527,40,36
+
+[v3Column66]
+Coordinates=1405,1113,86,36
+
+[v3Column115]
+Coordinates=1247,1113,94,36
+
+[cxGridDBColumn81]
+Coordinates=1118,1113,128,36
+
+[cxGridDBColumn38]
+Coordinates=989,1113,128,36
+
+[MenuItem2]
+Coordinates=900,1113,79,36
+
+[cxGridDBColumn1]
+Coordinates=583,1113,121,36
+
+[cxGridDBColumn76]
+Coordinates=454,1113,128,36
+
+[v3Column105]
+Coordinates=355,1113,94,36
+
+[v3Column128]
+Coordinates=256,1113,94,36
+
+[ClientDataSet5]
+Coordinates=983,10,101,58
+
+[cxGridDBColumn48]
+Coordinates=127,1113,128,36
+
+[v3Column116]
+Coordinates=28,1113,94,36
+
+[v3Column25]
+Coordinates=1855,56,86,36
+
+[ImageList_new32]
+Coordinates=1855,111,115,36
+
+[v3Column124]
+Coordinates=1855,166,94,36
+
+[v3Column38]
+Coordinates=1855,221,86,36
+
+[cxGridDBColumn118]
+Coordinates=1855,276,135,36
+
+[ToolButton2]
+Coordinates=82,416,84,36
+
+[v3Column90]
+Coordinates=1855,386,86,36
+
+[cxGridDBColumn90]
+Coordinates=1855,441,128,36
+
+[v3Column63]
+Coordinates=1855,551,86,36
+
+[v3Column129]
+Coordinates=1855,606,94,36
+
+[v3Column42]
+Coordinates=1855,661,86,36
+
+[cxGridLevel1]
+Coordinates=1855,716,90,36
+
+[v3Column15]
+Coordinates=1855,771,86,36
+
+[Panel2]
+Coordinates=220,212,55,58
+
+[cxTabSheet2]
+Coordinates=1031,348,90,36
+
+[cxGridDBColumn45]
+Coordinates=1855,881,128,36
+
+[cxGridDBColumn78]
+Coordinates=1855,991,128,36
+
+[v3Column14]
+Coordinates=1855,1046,86,36
+
+[cxGridDBColumn84]
+Coordinates=1855,1101,128,36
+
+[v3Column82]
+Coordinates=1855,1156,86,36
+
+[v3Column29]
+Coordinates=1766,1187,86,36
+
+[cxGridDBColumn68]
+Coordinates=1637,1187,128,36
+
+[v2Column3]
+Coordinates=1548,1187,79,36
+
+[v3Column146]
+Coordinates=1449,1187,94,36
+
+[v3Column21]
+Coordinates=1271,1187,86,36
+
+[Tv2]
+Coordinates=83,527,40,36
+
+[cxGridDBColumn35]
+Coordinates=1073,1187,128,36
+
+[v3Column49]
+Coordinates=984,1187,86,36
+
+[cxGridDBColumn73]
+Coordinates=855,1187,128,36
+
+[cxGridDBColumn111]
+Coordinates=716,1187,135,36
+
+[cxGridDBColumn96]
+Coordinates=587,1187,128,36
+
+[v3Column58]
+Coordinates=498,1187,86,36
+
+[v2Column6]
+Coordinates=300,1187,79,36
+
+[v3Column88]
+Coordinates=211,1187,86,36
+
+[cxGridDBColumn70]
+Coordinates=82,1187,128,36
+
+[v3Column32]
+Coordinates=2039,1,86,36
+
+[v3Column77]
+Coordinates=2039,56,86,36
+
+[ToolButton8]
+Coordinates=1078,554,84,36
+
+[v3Column79]
+Coordinates=2039,166,86,36
+
+[cxGridDBColumn85]
+Coordinates=2039,221,128,36
+
+[v3Column47]
+Coordinates=2039,276,86,36
+
+[cxGridDBColumn69]
+Coordinates=2039,331,128,36
+
+[DataSource2]
+Coordinates=357,298,89,36
+
+[cxGridDBColumn59]
+Coordinates=2039,386,128,36
+
+[Tv3]
+Coordinates=2039,496,40,36
+
+[v3Column87]
+Coordinates=2039,551,86,36
+
+[v2Column1]
+Coordinates=2039,606,79,36
+
+[v3Column135]
+Coordinates=2039,661,94,36
+
+[cxGridDBColumn82]
+Coordinates=2039,716,128,36
+
+[cxGridDBColumn64]
+Coordinates=2039,771,128,36
+
+[v3Column1]
+Coordinates=2039,826,79,36
+
+[v3Column22]
+Coordinates=2039,936,86,36
+
+[v3Column11]
+Coordinates=2039,991,86,36
+
+[v3Column6]
+Coordinates=2039,1046,79,36
+
+[v3Column41]
+Coordinates=2039,1101,86,36
+
+[v3Column103]
+Coordinates=2039,1156,94,36
+
+[cxGridDBColumn37]
+Coordinates=2039,1211,128,36
+
+[v3Column61]
+Coordinates=2020,1261,86,36
+
+[v2Column12]
+Coordinates=1931,1261,86,36
+
+[cxGridDBColumn99]
+Coordinates=1733,1261,128,36
+
+[cxGridDBColumn74]
+Coordinates=1545,1261,128,36
+
+[v3Column106]
+Coordinates=1446,1261,94,36
+
+[TBSave]
+Coordinates=610,554,60,36
+
+[v3Column96]
+Coordinates=1288,1261,86,36
+
+[v3Column123]
+Coordinates=1189,1261,94,36
+
+[ToolButton4]
+Coordinates=910,554,84,36
+
+[v3Column39]
+Coordinates=1011,1261,86,36
+
+[v3Column95]
+Coordinates=922,1261,86,36
+
+[cxGridDBColumn92]
+Coordinates=793,1261,128,36
+
+[v3Column16]
+Coordinates=704,1261,86,36
+
+[Panel1]
+Coordinates=145,280,55,58
+
+[v3Column112]
+Coordinates=605,1261,94,36
+
+[cxGridDBColumn93]
+Coordinates=476,1261,128,36
+
+[cxGridDBColumn114]
+Coordinates=337,1261,135,36
+
+[cxGridDBColumn55]
+Coordinates=208,1261,128,36
+
+[cxGridDBColumn88]
+Coordinates=79,1261,128,36
+
+[cxGridDBColumn100]
+Coordinates=2205,1,135,36
+
+[cxGridDBColumn98]
+Coordinates=2205,56,128,36
+
+[v3Column131]
+Coordinates=2205,111,94,36
+
+[v3Column100]
+Coordinates=2205,166,94,36
+
+[cxGridDBColumn65]
+Coordinates=2205,221,128,36
+
+[cxGridDBColumn116]
+Coordinates=2205,276,135,36
+
+[v3Column102]
+Coordinates=2205,331,94,36
+
+[v3Column144]
+Coordinates=2205,386,94,36
+
+[v3Column78]
+Coordinates=2205,441,86,36
+
+[v3Column136]
+Coordinates=2205,496,94,36
+
+[v3Column80]
+Coordinates=2205,551,86,36
+
+[v3Column117]
+Coordinates=2205,606,94,36
+
+[v3Column138]
+Coordinates=2205,661,94,36
+
+[v3Column119]
+Coordinates=2205,716,94,36
+
+[CDS_YuanLiao]
+Coordinates=553,280,103,58
+
+[cxGridDBColumn117]
+Coordinates=2205,771,135,36
+
+[cxGridDBColumn54]
+Coordinates=2205,826,128,36
+
+[v3Column92]
+Coordinates=2205,881,86,36
+
+[v3Column18]
+Coordinates=2205,936,86,36
+
+[cxGridDBColumn87]
+Coordinates=2205,991,128,36
+
+[v3Column17]
+Coordinates=2205,1046,86,36
+
+[v3Column111]
+Coordinates=2205,1101,94,36
+
+[cxGridDBColumn110]
+Coordinates=2205,1156,135,36
+
+[v3Column76]
+Coordinates=2205,1211,86,36
+
+[cxGridDBColumn66]
+Coordinates=2205,1266,128,36
+
+[v3Column104]
+Coordinates=2205,1321,94,36
+
+[cxGridDBColumn83]
+Coordinates=2076,1335,128,36
+
+[cxGridDBColumn107]
+Coordinates=1937,1335,135,36
+
+[v3Column7]
+Coordinates=1848,1335,79,36
+
+[cxGridLevel6]
+Coordinates=1749,1335,90,36
+
+[v3Column40]
+Coordinates=1571,1335,86,36
+
+[v3Column54]
+Coordinates=1413,1335,86,36
+
+[v3Column94]
+Coordinates=1324,1335,86,36
+
+[v3Column31]
+Coordinates=1235,1335,86,36
+
+[Tv2Column4]
+Coordinates=1146,1335,87,36
+
+[v3Column44]
+Coordinates=1057,1335,86,36
+
+[v3Column142]
+Coordinates=958,1335,94,36
+
+[cxGridDBColumn39]
+Coordinates=829,1335,128,36
+
+[cxGridDBColumn60]
+Coordinates=700,1335,128,36
+
+[v3Column99]
+Coordinates=611,1335,86,36
+
+[v3Column12]
+Coordinates=522,1335,86,36
+
+[cxGridDBColumn75]
+Coordinates=393,1335,128,36
+
+[ADOQueryTemp]
+Coordinates=987,212,109,58
+
+[cxGridDBColumn105]
+Coordinates=254,1335,135,36
+
+[v3Column60]
+Coordinates=165,1335,86,36
+
+[cxGridDBColumn108]
+Coordinates=26,1335,135,36
+
+[v3Column86]
+Coordinates=2378,1,86,36
+
+[v3Column3]
+Coordinates=2378,56,79,36
+
+[v3Column23]
+Coordinates=2378,111,86,36
+
+[v3Column98]
+Coordinates=2378,166,86,36
+
+[v3Column83]
+Coordinates=2378,276,86,36
+
+[cxGridDBColumn58]
+Coordinates=2378,386,128,36
+
+[v3Column89]
+Coordinates=2378,441,86,36
+
+[v3Column132]
+Coordinates=2378,496,94,36
+
+[cxGridDBColumn79]
+Coordinates=2378,551,128,36
+
+[cxGrid3]
+Coordinates=283,600,59,36
+
+[cxGridDBColumn80]
+Coordinates=2378,661,128,36
+
+[v3Column5]
+Coordinates=2378,716,79,36
+
+[v3Column118]
+Coordinates=2378,771,94,36
+
+[v3Column113]
+Coordinates=2378,826,94,36
+
+[v3Column122]
+Coordinates=2378,881,94,36
+
+[v3Column71]
+Coordinates=2378,936,86,36
+
+[v3Column65]
+Coordinates=2378,991,86,36
+
+[cxGridDBColumn36]
+Coordinates=2378,1046,128,36
+
+[v3Column93]
+Coordinates=2378,1101,86,36
+
+[cxGridDBColumn77]
+Coordinates=2378,1211,128,36
+
+[DataLink_KnitPlan.AdoDataLink]
+Coordinates=1076,144,198,58
+
+[v3Column59]
+Coordinates=2378,1266,86,36
+
+[v3Column75]
+Coordinates=2378,1321,86,36
+
+[v3Column53]
+Coordinates=2378,1376,86,36
+
+[PM_5]
+Coordinates=2329,1409,48,36
+
+[v3Column48]
+Coordinates=2240,1409,86,36
+
+[v3Column62]
+Coordinates=2151,1409,86,36
+
+[]
+Coordinates=259,462,76,36
+Visible=True
+
+[ClientDataSet3]
+Coordinates=636,348,101,58
+
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanList.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanList.dfm
@ -1,15 +1,13 @@
 inherited frmKnitPlanList: TfrmKnitPlanList
-  Left = 249
-  Top = 194
+  Top = 185
  Caption = #36710#38388#29983#20135#35745#21010#21333
  ClientHeight = 642
  ClientWidth = 1540
-  Font.Height = -16
-  Position = poScreenCenter
+  Position = poDesigned
  ExplicitWidth = 1556
  ExplicitHeight = 681
  PixelsPerInch = 96
-  TextHeight = 21
+  TextHeight = 17
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
@ -25,7 +23,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
    Font.Charset = GB2312_CHARSET
    Font.Color = clWindowText
    Font.Height = -12
-    Font.Name = #23435#20307
+    Font.Name = #24494#36719#38597#40657
    Font.Style = []
    Images = DataLink_KnitPlan.cxImageList_bar
    List = True
@ -174,134 +172,168 @@ inherited frmKnitPlanList: TfrmKnitPlanList
    Left = 0
    Top = 30
    Width = 1540
-    Height = 131
+    Height = 139
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    Color = clWhite
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -12
+    Font.Name = #24494#36719#38597#40657
+    Font.Style = []
    ParentBackground = False
+    ParentFont = False
    TabOrder = 1
+    ExplicitTop = 39
    object Label3: TLabel
-      Left = 25
-      Top = 51
-      Width = 48
-      Height = 21
+      Left = 27
+      Top = 55
+      Width = 36
+      Height = 17
      Caption = #21512#21516#21495
    end
    object Label5: TLabel
-      Left = 421
-      Top = 88
-      Width = 64
-      Height = 21
+      Left = 418
+      Top = 96
+      Width = 48
+      Height = 17
      Caption = #20135#21697#21517#31216
    end
    object Label10: TLabel
-      Left = 421
-      Top = 51
-      Width = 64
-      Height = 21
+      Left = 418
+      Top = 55
+      Width = 48
+      Height = 17
      Caption = #20135#21697#32534#21495
    end
    object Label7: TLabel
-      Left = 231
-      Top = 51
-      Width = 32
-      Height = 21
+      Left = 223
+      Top = 55
+      Width = 24
+      Height = 17
      Caption = #23458#25143
    end
    object lbl1: TLabel
-      Left = 231
-      Top = 88
-      Width = 32
-      Height = 21
+      Left = 223
+      Top = 96
+      Width = 24
+      Height = 17
      Caption = #31867#22411
    end
    object Label4: TLabel
-      Left = 25
-      Top = 88
-      Width = 48
-      Height = 21
+      Left = 27
+      Top = 96
+      Width = 36
+      Height = 17
      Caption = #35745#21010#21333
    end
    object ConNo: TcxTextEdit
      Tag = 2
-      Left = 77
-      Top = 45
+      Left = 83
+      Top = 50
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 0
      OnKeyPress = conPress
-      Width = 150
+      Width = 120
    end
    object C_Name: TcxTextEdit
      Tag = 2
-      Left = 489
-      Top = 82
+      Left = 481
+      Top = 90
      ParentFont = False
-      Properties.OnChange = C_NamePropertiesChange
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 1
      OnKeyPress = C_NameKeyPress
-      Width = 150
+      Width = 120
    end
    object C_Code: TcxTextEdit
      Tag = 2
-      Left = 489
-      Top = 45
+      Left = 481
+      Top = 48
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 2
      OnKeyPress = C_CodeKeyPress
-      Width = 150
+      Width = 120
    end
    object CustName: TcxTextEdit
      Tag = 2
-      Left = 267
-      Top = 45
+      Left = 269
+      Top = 50
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 3
      OnKeyPress = CustNameKeyPress
-      Width = 150
+      Width = 120
    end
    object OrderNo: TcxTextEdit
      Tag = 2
-      Left = 77
-      Top = 82
+      Left = 83
+      Top = 91
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 4
      OnKeyPress = conPress
-      Width = 150
+      Width = 120
    end
-    object OrdType: TcxComboBox
+    object cxComboBox1: TcxComboBox
      Tag = 2
-      Left = 267
-      Top = 82
+      Left = 268
+      Top = 91
      ParentFont = False
-      Properties.DropDownListStyle = lsFixedList
      Properties.Items.Strings = (
-        ''
        #22823#36135#21333
        #22806#21457#21333
        #35797#26679#21333)
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 5
-      Width = 150
+      Width = 120
    end
-    inline frmFrameDateSel1: TfrmFrameDateSel
-      Left = 2
-      Top = 2
-      Width = 1536
+    inline TfrmFrameDateSel: TfrmFrameDateSel
+      Left = -1
+      Top = 4
+      Width = 1078
      Height = 37
-      Align = alTop
      Color = clWhite
      ParentBackground = False
      ParentColor = False
      TabOrder = 6
-      ExplicitLeft = 2
-      ExplicitTop = 2
-      ExplicitWidth = 1536
+      ExplicitLeft = -1
+      ExplicitTop = 4
      inherited BegDate: TcxDateEdit
+        Left = 90
+        Top = 2
+        ExplicitLeft = 90
+        ExplicitTop = 2
        ExplicitHeight = 33
      end
      inherited EndDate: TcxDateEdit
        ExplicitHeight = 33
      end
+      inherited cxButton3: TcxButton
+        Top = 2
+        ExplicitTop = 2
+      end
      inherited cbbType: TcxComboBox
        ExplicitHeight = 33
      end
@ -309,12 +341,15 @@ inherited frmKnitPlanList: TfrmKnitPlanList
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
-    Top = 189
+    Top = 169
    Width = 1317
-    Height = 453
+    Height = 473
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
+    ExplicitLeft = -1
+    ExplicitTop = 177
+    ExplicitHeight = 465
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      ScrollbarAnnotations.CustomAnnotations = <>
@ -387,15 +422,21 @@ inherited frmKnitPlanList: TfrmKnitPlanList
          Kind = skSum
        end>
      DataController.Summary.SummaryGroups = <>
+      Images = DataLink_KnitPlan.ImageList_new32
      OptionsCustomize.ColumnFiltering = False
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
+      Styles.IncSearch = DataLink_KnitPlan.Default
+      Styles.Header = DataLink_KnitPlan.Default
+      Styles.Inactive = DataLink_KnitPlan.Default
+      Styles.Selection = DataLink_KnitPlan.Default
      object v1OrderNo: TcxGridDBColumn
        Caption = #21512#21516#21495
        DataBinding.FieldName = 'ConNo'
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 100
      end
      object Tv1Column2: TcxGridDBColumn
@ -420,6 +461,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 71
      end
      object Tv1Column1: TcxGridDBColumn
@ -439,6 +481,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 82
      end
      object v1Column21: TcxGridDBColumn
@ -447,6 +490,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 92
      end
      object v1Column2: TcxGridDBColumn
@ -455,6 +499,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 73
      end
      object v1Column20: TcxGridDBColumn
@ -471,6 +516,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 67
      end
      object v1PRTMF: TcxGridDBColumn
@ -479,6 +525,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 69
      end
      object Tv1Column3: TcxGridDBColumn
@ -495,6 +542,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 76
      end
      object v1Column6: TcxGridDBColumn
@ -503,6 +551,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 59
      end
      object v1Column22: TcxGridDBColumn
@ -511,6 +560,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 63
      end
      object v1Column7: TcxGridDBColumn
@ -519,6 +569,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 72
      end
      object v1PRTOrderQty: TcxGridDBColumn
@ -527,6 +578,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 92
      end
      object v1Column12: TcxGridDBColumn
@ -535,6 +587,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 64
      end
      object v1Column4: TcxGridDBColumn
@ -543,6 +596,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList
        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
+        Styles.Header = DataLink_KnitPlan.Default
        Width = 68
      end
      object Tv1Column7: TcxGridDBColumn
@ -583,9 +637,9 @@ inherited frmKnitPlanList: TfrmKnitPlanList
  end
  object cxTabControl1: TcxTabControl [3]
    Left = 0
-    Top = 161
+    Top = 169
    Width = 1540
-    Height = 28
+    Height = 0
    Align = alTop
    Font.Charset = GB2312_CHARSET
    Font.Color = clWindowText
@ -603,162 +657,164 @@ inherited frmKnitPlanList: TfrmKnitPlanList
      #24050#32467#26463
      #20840#37096)
    OnChange = cxTabControl1Change
-    ClientRectBottom = 30
-    ClientRectRight = 1540
-    ClientRectTop = 30
+    ExplicitTop = 177
+    ClientRectRight = 0
+    ClientRectTop = 0
  end
  object Panel2: TPanel [4]
    Left = 1317
-    Top = 189
+    Top = 169
    Width = 223
-    Height = 453
+    Height = 473
    Align = alRight
    TabOrder = 4
+    ExplicitTop = 177
+    ExplicitHeight = 465
    object Label6: TLabel
      Left = 28
-      Top = 48
-      Width = 52
-      Height = 12
+      Top = 47
+      Width = 48
+      Height = 17
      Caption = #24067#21305#25171#21360
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label8: TLabel
      Left = 28
-      Top = 74
-      Width = 52
-      Height = 12
+      Top = 73
+      Width = 48
+      Height = 17
      Caption = #26816#39564#21305#25968
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clMaroon
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label9: TLabel
      Left = 28
-      Top = 99
-      Width = 52
-      Height = 12
+      Top = 98
+      Width = 48
+      Height = 17
      Caption = #26816#39564#25968#37327
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clMaroon
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label11: TLabel
      Left = 28
-      Top = 125
-      Width = 52
-      Height = 12
+      Top = 124
+      Width = 48
+      Height = 17
      Caption = #20986#24211#21305#25968
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clNavy
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label12: TLabel
      Left = 28
-      Top = 152
-      Width = 52
-      Height = 12
+      Top = 151
+      Width = 48
+      Height = 17
      Caption = #20986#24211#25968#37327
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clNavy
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label13: TLabel
      Left = 28
-      Top = 178
-      Width = 52
-      Height = 12
+      Top = 177
+      Width = 48
+      Height = 17
      Caption = #24211#23384#21305#25968
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clOlive
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label14: TLabel
      Left = 28
-      Top = 204
-      Width = 52
-      Height = 12
+      Top = 203
+      Width = 48
+      Height = 17
      Caption = #24211#23384#25968#37327
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clOlive
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object CardPiece: TcxTextEdit
      Left = 86
      Top = 44
+      AutoSize = False
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 0
      OnKeyPress = conPress
+      Height = 20
      Width = 112
    end
    object PBJYPS: TcxTextEdit
      Left = 86
      Top = 70
+      AutoSize = False
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 1
      OnKeyPress = conPress
+      Height = 20
      Width = 112
    end
    object PBJYQty: TcxTextEdit
      Left = 86
      Top = 95
+      AutoSize = False
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 2
      OnKeyPress = conPress
+      Height = 20
      Width = 112
    end
    object PBCKPS: TcxTextEdit
      Left = 86
      Top = 121
+      AutoSize = False
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 3
      OnKeyPress = conPress
+      Height = 20
      Width = 112
    end
    object PBCKQty: TcxTextEdit
      Left = 86
      Top = 148
+      AutoSize = False
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 4
      OnKeyPress = conPress
+      Height = 20
      Width = 112
    end
    object PBKCPS: TcxTextEdit
      Left = 86
      Top = 174
+      AutoSize = False
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 5
      OnKeyPress = conPress
+      Height = 20
      Width = 112
    end
    object PBKCQty: TcxTextEdit
      Left = 86
      Top = 200
+      AutoSize = False
      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 6
      OnKeyPress = conPress
+      Height = 20
      Width = 112
    end
  end
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanList.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanList.pas
@ -1,7 +1,5 @@
 unit U_KnitPlanList;
-
 interface
-
 uses
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
  Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData,
@ -28,8 +26,8 @@ uses
  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue, dxScrollbarAnnotations,
-  cxContainer, cxMaskEdit, cxDropDownEdit, FrameDateSel;
-
+  cxContainer, dxCore, cxDateUtils, cxDropDownEdit, cxButtons, cxMaskEdit,
+  FrameDateSel;
 type
  TfrmKnitPlanList = class(TfrmBaseList)
    ToolBar1: TToolBar;
@ -113,8 +111,8 @@ type
    Tv1Column7: TcxGridDBColumn;
    PopupMenu1: TPopupMenu;
    N1: TMenuItem;
-    OrdType: TcxComboBox;
-    frmFrameDateSel1: TfrmFrameDateSel;
+    cxComboBox1: TcxComboBox;
+    TfrmFrameDateSel: TfrmFrameDateSel;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
    procedure TBFindClick(Sender: TObject);
@ -129,7 +127,7 @@ type
    procedure conPress(Sender: TObject; var Key: Char);
    procedure TBViewClick(Sender: TObject);
    procedure TBCopyClick(Sender: TObject);
-    procedure OrdType1Change(Sender: TObject);
+    procedure OrdTypeChange(Sender: TObject);
    procedure C_CodeKeyPress(Sender: TObject; var Key: Char);
    procedure BatchNoHZKeyPress(Sender: TObject; var Key: Char);
    procedure CustNameKeyPress(Sender: TObject; var Key: Char);
@ -144,7 +142,6 @@ type
    procedure ToolButton2Click(Sender: TObject);
    procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
    procedure N1Click(Sender: TObject);
-    procedure C_NamePropertiesChange(Sender: TObject);
  private
    FInt, PFInt: Integer;
    procedure InitGrid();
@ -156,21 +153,16 @@ type
    canshu1, FCheJian: string;
    { Public declarations }
  end;
-
 implementation
-
 uses
  U_DataLink, U_KnitPlanInPut, U_RTFun, U_ZDYHelp, U_LabelPrint, U_KnitCardInPut,
  U_KnitInspSet;
-
 {$R *.dfm}
-
 procedure TfrmKnitPlanList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
  inherited;
  Action := caFree;
 end;
-
 procedure TfrmKnitPlanList.InitButton();
 begin
  TBAdd.Enabled := False;
@ -193,7 +185,6 @@ begin
          TBSCAP.Enabled := true;
          TBEdit.Enabled := true;
          btnChk.Enabled := true;
-
        end;
      1:
        begin
@ -210,7 +201,6 @@ begin
        end;
    end;
  end;
-
  if Trim(canshu1) = '管理' then
  begin
    case cxTabControl1.TabIndex of
@ -238,16 +228,12 @@ begin
        end;
    end;
  end;
-
 end;
-
 procedure TfrmKnitPlanList.TBCloseClick(Sender: TObject);
 begin
-
  WriteCxGrid('坯布生产计划单', Tv1, '坯布生产管理');
  Close;
 end;
-
 procedure TfrmKnitPlanList.InitGrid();
 begin
  try
@ -259,13 +245,10 @@ begin
      sql.Clear;
      sql.Add('select A.*,B.*  ');
      sql.Add(',APPS=(select count(X.pcid) from knit_Plan_Card X where X.SubId=B.Subid)');
-
      sql.Add(',Y_NameS= SUBSTRING(CAST((select  ''+'' +X.Y_Name from knit_Plan_Yarn X where   X.subid=B.subid order by YRId for xml path('''') ) AS VARCHAR(100)) , 2, 100)   ');
-
      sql.Add(' from knit_Plan_Main A inner join knit_Plan_Sub B on A.Mainid=B.MainId');
-      sql.Add(' where A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.BegDate.Date)) + '''');
-      sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.EndDate.Date + 1)) + '''');
-
+      sql.Add(' where A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd',  TfrmFrameDateSel.BegDate.Date)) + '''');
+      sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd',  TfrmFrameDateSel.EndDate.Date + 1)) + '''');
      case cxTabControl1.TabIndex of
        0:
          begin
@ -278,10 +261,11 @@ begin
        2:
          begin
            sql.Add('and isnull(Status,''0'') =''10'' ');
+            sql.Add(' and A.FillTIme>=''' + Trim(FormatDateTime('yyyy-MM-dd',  TfrmFrameDateSel.BegDate.Date)) + '''');
+            sql.Add(' and A.FillTIme<''' + Trim(FormatDateTime('yyyy-MM-dd',  TfrmFrameDateSel.EndDate.Date + 1)) + '''');
          end;
      end;
      sql.add('order by A.FILLTIME DESC');
-//      ShowMessage(sql.Text);
      Open;
    end;
    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
@ -291,21 +275,18 @@ begin
    ADOQueryMain.EnableControls;
  end;
 end;
-
 procedure TfrmKnitPlanList.N1Click(Sender: TObject);
 begin
  CopyTVFocusValue(TV1);
 end;
-
 procedure TfrmKnitPlanList.InitForm();
 begin
  InitButton();
  ReadCxGrid(trim(self.Caption), Tv1, '坯布生产管理');
-  frmFrameDateSel1.BegDate.Date := SGetServerDate(ADOQueryTemp) - 30;
-  frmFrameDateSel1.EndDate.Date := SGetServerDate(ADOQueryTemp);
+  TfrmFrameDateSel.BegDate.Date := SGetServerDate(ADOQueryTemp) - 30;
+  TfrmFrameDateSel.EndDate.Date := SGetServerDate(ADOQueryTemp);
  InitGrid();
 end;
-
 procedure TfrmKnitPlanList.TBFindClick(Sender: TObject);
 begin
  TBRafresh.Click;
@ -315,7 +296,6 @@ begin
  SCreateCDS(ADOQueryMain, CDS_1);
  SInitCDSData(ADOQueryMain, CDS_1);
 end;
-
 procedure TfrmKnitPlanList.TBNoEndClick(Sender: TObject);
 begin
  if CDS_1.IsEmpty then
@ -327,7 +307,6 @@ begin
      sql.Clear;
      sql.Add('update  knit_Plan_Main SET status=''9'',Comper=null,Comptime=null ');
      sql.Add('where mainID=' + quotedstr(trim(CDS_1.fieldbyname('mainID').AsString)));
-
      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
      sql.Add(' ' + quotedstr(trim(DName)));
      sql.Add(',getdate() ');
@ -344,7 +323,6 @@ begin
    application.MessageBox('撤销结束失败！', '提示信息', 0);
  end;
 end;
-
 procedure TfrmKnitPlanList.TBEditClick(Sender: TObject);
 begin
  if CDS_1.IsEmpty then
@ -366,7 +344,6 @@ begin
    frmKnitPlanInPut.Free;
  end;
 end;
-
 procedure TfrmKnitPlanList.TBEndClick(Sender: TObject);
 begin
  if CDS_1.IsEmpty then
@ -378,7 +355,6 @@ begin
      sql.Clear;
      sql.Add('update  knit_Plan_Main SET status=''10'' ,Comper=''' + trim(DName) + ''',Comptime=getdate() ');
      sql.Add('where mainID=' + quotedstr(trim(CDS_1.fieldbyname('mainID').AsString)));
-
      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
      sql.Add(' ' + quotedstr(trim(DName)));
      sql.Add(',getdate() ');
@ -395,7 +371,6 @@ begin
    application.MessageBox('结束失败！', '提示信息', 0);
  end;
 end;
-
 procedure TfrmKnitPlanList.TBDelClick(Sender: TObject);
 begin
  if CDS_1.IsEmpty then
@ -424,7 +399,6 @@ begin
    CDS_1.Delete;
  end;
 end;
-
 function TfrmKnitPlanList.DelData(): Boolean;
 begin
  try
@ -448,14 +422,12 @@ begin
    Application.MessageBox('数据删除异常！', '提示', 0);
  end;
 end;
-
 procedure TfrmKnitPlanList.TBExportClick(Sender: TObject);
 begin
  if ADOQueryMain.IsEmpty then
    Exit;
  TcxGridToExcel('坯布生产单', cxGrid1);
 end;
-
 procedure TfrmKnitPlanList.TBPrintClick(Sender: TObject);
 var
  WSql: string;
@ -463,7 +435,6 @@ begin
  if CDS_1.IsEmpty then
    Exit;
  WSql := (Trim(CDS_1.fieldbyname('MainId').AsString));
-
  try
    frmLabelPrint := TfrmLabelPrint.Create(Application);
    with frmLabelPrint do
@ -478,14 +449,11 @@ begin
  finally
    frmLabelPrint.Free;
  end;
-
 end;
-
 procedure TfrmKnitPlanList.TBRafreshClick(Sender: TObject);
 begin
  InitGrid();
 end;
-
 procedure TfrmKnitPlanList.TBSCAPClick(Sender: TObject);
 var
  FMainId, FSubId: string;
@ -504,12 +472,9 @@ begin
  finally
    frmKnitCardInPut.Free;
  end;
-
 end;
-
 procedure TfrmKnitPlanList.TBAddClick(Sender: TObject);
 begin
-
  try
    frmKnitPlanInPut := TfrmKnitPlanInPut.Create(Application);
    with frmKnitPlanInPut do
@ -526,7 +491,6 @@ begin
    frmKnitPlanInPut.Free;
  end;
 end;
-
 procedure TfrmKnitPlanList.ConNoChange(Sender: TObject);
 begin
  if ADOQueryMain.Active = False then
@ -535,15 +499,12 @@ begin
  SCreateCDS(ADOQueryMain, CDS_1);
  SInitCDSData(ADOQueryMain, CDS_1);
 end;
-
 procedure TfrmKnitPlanList.FormShow(Sender: TObject);
 begin
  inherited;
  canshu1 := DParameters1;
  InitForm();
-
 end;
-
 procedure TfrmKnitPlanList.conPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
@ -562,7 +523,6 @@ begin
                                             // +' and ConType=''生产'' ';
        sql.Add('select * from knit_Plan_Main A inner join knit_Plan_Sub B on A.Mainid=B.MainId');
        sql.Add(' where A.ConNo like ''' + '%' + Trim(ConNo.Text) + '%' + '''');
-
        Open;
      end;
      SCreateCDS(ADOQueryMain, CDS_1);
@ -572,7 +532,6 @@ begin
    end;
  end;
 end;
-
 procedure TfrmKnitPlanList.TBViewClick(Sender: TObject);
 begin
  try
@ -588,38 +547,31 @@ begin
      ScrollBox1.Enabled := False;
      if ShowModal = 1 then
      begin
-
      end;
    end;
  finally
    frmKnitPlanInPut.Free;
  end;
 end;
-
 procedure TfrmKnitPlanList.ToolButton1Click(Sender: TObject);
 begin
  WriteCxGrid(trim(self.Caption), Tv1, '坯布生产管理');
 end;
-
 procedure TfrmKnitPlanList.ToolButton2Click(Sender: TObject);
 begin
  try
    frmKnitInspSet := TfrmKnitInspSet.Create(Application);
    with frmKnitInspSet do
    begin
-
      FDataID := Trim(Self.CDS_1.fieldbyname('MainId').AsString);
-
      if ShowModal = 1 then
      begin
-
      end;
    end;
  finally
    frmKnitInspSet.Free;
  end;
 end;
-
 procedure TfrmKnitPlanList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
 var
  fwhere: string;
@ -629,15 +581,14 @@ begin
  begin
    Close;
    SQL.Clear;
-    sql.Add(' exec P_Knit_Plan_Progress @Begdate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.Begdate.Date))));
-    sql.Add(',@enddate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.EndDate.Date + 1))));
+    sql.Add(' exec P_Knit_Plan_Progress @Begdate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', TfrmFrameDateSel.Begdate.Date))));
+    sql.Add(',@enddate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', TfrmFrameDateSel.EndDate.Date + 1))));
    sql.Add(',@criteria= ' + quotedstr(fwhere));
    Open;
  end;
  SClearData(Panel2, 0);
  SCSHData(ADO_JD, Panel2, 0);
 end;
-
 procedure TfrmKnitPlanList.btnChkClick(Sender: TObject);
 begin
  if CDS_1.IsEmpty then
@ -649,7 +600,6 @@ begin
      sql.Clear;
      sql.Add('update  knit_Plan_Main SET status=''9'',chker=''' + trim(DName) + ''',Chktime=getdate() ');
      sql.Add('where mainID=' + quotedstr(trim(CDS_1.fieldbyname('mainID').AsString)));
-
      sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
      sql.Add(' ' + quotedstr(trim(DName)));
      sql.Add(',getdate() ');
@ -665,9 +615,7 @@ begin
  except
    application.MessageBox('开始失败！', '提示信息', 0);
  end;
-
 end;
-
 procedure TfrmKnitPlanList.btnReChkClick(Sender: TObject);
 begin
  if CDS_1.IsEmpty then
@ -699,7 +647,6 @@ begin
    application.MessageBox('计划单撤销开始失败！', '提示信息', 0);
  end;
 end;
-
 procedure TfrmKnitPlanList.TBCopyClick(Sender: TObject);
 begin
  if CDS_1.IsEmpty then
@ -714,19 +661,16 @@ begin
      FConNo := Trim(Self.CDS_1.fieldbyname('ConNo').AsString);
      if ShowModal = 1 then
      begin
-
      end;
    end;
  finally
    frmKnitPlanInPut.Free;
  end;
 end;
-
-procedure TfrmKnitPlanList.OrdType1Change(Sender: TObject);
+procedure TfrmKnitPlanList.OrdTypeChange(Sender: TObject);
 begin
  TBRafresh.Click;
 end;
-
 procedure TfrmKnitPlanList.C_CodeKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
@ -737,7 +681,6 @@ begin
  SCreateCDS(ADOQueryMain, CDS_1);
  SInitCDSData(ADOQueryMain, CDS_1);
 end;
-
 procedure TfrmKnitPlanList.BatchNoHZKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
@ -748,7 +691,6 @@ begin
  SCreateCDS(ADOQueryMain, CDS_1);
  SInitCDSData(ADOQueryMain, CDS_1);
 end;
-
 procedure TfrmKnitPlanList.CustNameKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
@ -759,13 +701,11 @@ begin
  SCreateCDS(ADOQueryMain, CDS_1);
  SInitCDSData(ADOQueryMain, CDS_1);
 end;
-
 procedure TfrmKnitPlanList.cxTabControl1Change(Sender: TObject);
 begin
  InitButton();
  InitGrid();
 end;
-
 procedure TfrmKnitPlanList.C_NameKeyPress(Sender: TObject; var Key: Char);
 begin
  if Key = #13 then
@ -776,15 +716,4 @@ begin
  SCreateCDS(ADOQueryMain, CDS_1);
  SInitCDSData(ADOQueryMain, CDS_1);
 end;
-
-procedure TfrmKnitPlanList.C_NamePropertiesChange(Sender: TObject);
-begin
-  if ADOQueryMain.Active = False then
-    Exit;
-  SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
-  SCreateCDS(ADOQueryMain, CDS_1);
-  SInitCDSData(ADOQueryMain, CDS_1);
-end;
-
 end.
-
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanProgress.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanProgress.dfm
@ -2,25 +2,25 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
  Left = 238
  Top = 107
  Caption = #35746#21333#36827#24230
-  ClientHeight = 554
+  ClientHeight = 547
  ClientWidth = 1267
  ExplicitWidth = 1283
-  ExplicitHeight = 593
+  ExplicitHeight = 586
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 17
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1267
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 75
+    ButtonHeight = 30
+    ButtonWidth = 59
    Caption = 'ToolBar1'
    Color = clWhite
-    DisabledImages = DataLink_KnitPlan.ImageList_new32
-    Images = DataLink_KnitPlan.ImageList_new32
+    DisabledImages = DataLink_KnitPlan.cxImageList_bar
+    Images = DataLink_KnitPlan.cxImageList_bar
    List = True
    ParentColor = False
    ShowCaptions = True
@ -34,7 +34,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      OnClick = TBRafreshClick
    end
    object ToolButton2: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #36807#28388
@ -42,7 +42,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      OnClick = ToolButton2Click
    end
    object ToolButton1: TToolButton
-      Left = 142
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -50,7 +50,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 213
+      Left = 189
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -60,7 +60,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
  end
  object Panel1: TPanel [1]
    Left = 0
-    Top = 38
+    Top = 30
    Width = 1267
    Height = 69
    Align = alTop
@ -69,101 +69,113 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
    Color = clWhite
    ParentBackground = False
    TabOrder = 1
+    ExplicitTop = 38
    object Label3: TLabel
-      Left = 245
-      Top = 38
+      Left = 240
+      Top = 44
      Width = 24
-      Height = 12
+      Height = 17
      Caption = #21697#21517
    end
    object Label1: TLabel
-      Left = 246
-      Top = 12
+      Left = 240
+      Top = 14
      Width = 24
-      Height = 12
+      Height = 17
      Caption = #32534#21495
    end
    object Label4: TLabel
-      Left = 22
-      Top = 12
+      Left = 16
+      Top = 14
      Width = 24
-      Height = 12
+      Height = 17
      Caption = #26085#26399
    end
    object Label5: TLabel
-      Left = 31
-      Top = 38
+      Left = 24
+      Top = 44
      Width = 12
-      Height = 12
+      Height = 17
      Caption = #33267
    end
    object Label6: TLabel
-      Left = 423
-      Top = 12
+      Left = 416
+      Top = 14
      Width = 48
-      Height = 12
+      Height = 17
      Caption = #35745#21010#21333#21495
    end
-    object C_Name: TEdit
+    object C_Name: TcxTextEdit
      Tag = 2
-      Left = 299
-      Top = 34
-      Width = 89
-      Height = 20
-      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      Left = 296
+      Top = 36
+      AutoSize = False
+      ParentFont = False
      TabOrder = 3
-      OnChange = C_NameChange
+      Height = 25
+      Width = 88
    end
-    object C_Code: TEdit
+    object C_Code: TcxTextEdit
      Tag = 2
-      Left = 300
-      Top = 8
-      Width = 89
-      Height = 20
-      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      Left = 296
+      Top = 6
+      AutoSize = False
+      ParentFont = False
      TabOrder = 1
-      OnChange = C_NameChange
+      Height = 25
+      Width = 88
    end
-    object EndDate: TDateTimePicker
-      Left = 75
-      Top = 34
-      Width = 140
-      Height = 20
-      Date = 40768.000000000000000000
-      Time = 0.458268587972270300
-      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+    object EndDate: TcxDateEdit
+      Left = 73
+      Top = 37
+      AutoSize = False
+      EditValue = 40768d
+      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 2
+      Height = 25
+      Width = 144
    end
-    object Begdate: TDateTimePicker
-      Left = 76
-      Top = 8
-      Width = 140
-      Height = 20
-      Date = 40768.000000000000000000
-      Time = 0.458268587972270300
-      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+    object Begdate: TcxDateEdit
+      Left = 73
+      Top = 7
+      AutoSize = False
+      EditValue = 40768d
+      ParentFont = False
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
      TabOrder = 0
+      Height = 25
+      Width = 144
    end
-    object orderno: TEdit
+    object orderno: TcxTextEdit
      Tag = 2
-      Left = 501
-      Top = 8
-      Width = 89
-      Height = 20
-      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      Left = 496
+      Top = 6
+      AutoSize = False
+      ParentFont = False
      TabOrder = 4
-      OnChange = C_NameChange
+      Height = 25
+      Width = 88
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
-    Top = 107
+    Top = 99
    Width = 1267
-    Height = 447
+    Height = 448
    Align = alClient
    TabOrder = 2
+    ExplicitTop = 107
+    ExplicitHeight = 440
    object TV1: TcxGridDBBandedTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DataSource1
      DataController.Filter.AutoDataSetFilter = True
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -458,6 +470,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn35: TcxGridDBBandedColumn
        Caption = #20135#21697#21517#31216
        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 172
@ -468,6 +481,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn42: TcxGridDBBandedColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 166
@ -478,6 +492,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn51: TcxGridDBBandedColumn
        Caption = #21305#25968
        DataBinding.FieldName = 'OrdPiece'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -489,6 +504,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn52: TcxGridDBBandedColumn
        Caption = #25968#37327
        DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -499,6 +515,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      end
      object cxGridDBBandedColumn61: TcxGridDBBandedColumn
        DataBinding.FieldName = 'IsHG'
+        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -510,6 +527,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn63: TcxGridDBBandedColumn
        Caption = #27719#24635#21333#21495
        DataBinding.FieldName = 'OrderNoHZ'
+        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -521,6 +539,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn77: TcxGridDBBandedColumn
        Caption = #21305#25968
        DataBinding.FieldName = 'DCPS'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -531,6 +550,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn79: TcxGridDBBandedColumn
        Caption = #20986#24211#21305#25968
        DataBinding.FieldName = 'PBCKPS'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -542,6 +562,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn87: TcxGridDBBandedColumn
        Caption = #24211#23384#21305#25968
        DataBinding.FieldName = 'PBKCPS'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -553,6 +574,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object cxGridDBBandedColumn91: TcxGridDBBandedColumn
        Caption = #25968#37327
        DataBinding.FieldName = 'DCSL'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -563,6 +585,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object V1Column26: TcxGridDBBandedColumn
        Caption = #20811#37325
        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 131
@ -573,6 +596,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object V1Column27: TcxGridDBBandedColumn
        Caption = #38376#24133
        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 140
@ -583,6 +607,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object V1Column5: TcxGridDBBandedColumn
        Caption = #24211#23384#25968#37327
        DataBinding.FieldName = 'PBKCQty'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -594,6 +619,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object V1Column7: TcxGridDBBandedColumn
        Caption = #20986#24211#25968#37327
        DataBinding.FieldName = 'PBCKQty'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -604,6 +630,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object V1Column3: TcxGridDBBandedColumn
        Caption = #26816#39564#21305#25968
        DataBinding.FieldName = 'JYPS'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Position.BandIndex = -1
@ -613,6 +640,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object V1Column8: TcxGridDBBandedColumn
        Caption = #26816#39564#38271#24230
        DataBinding.FieldName = 'JYlen'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Position.BandIndex = -1
@ -622,6 +650,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object V1Column9: TcxGridDBBandedColumn
        Caption = #25171#21360#24352#25968
        DataBinding.FieldName = 'CardPiece'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -632,6 +661,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object V1Column11: TcxGridDBBandedColumn
        Caption = #26816#39564#37325#37327
        DataBinding.FieldName = 'JYGW'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Position.BandIndex = -1
@ -641,6 +671,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object TV1Column4: TcxGridDBBandedColumn
        Caption = #35745#21010#21333#21495
        DataBinding.FieldName = 'orderno'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 188
@ -651,6 +682,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object TV1Column16: TcxGridDBBandedColumn
        Caption = #26816#39564#21305#25968
        DataBinding.FieldName = 'PBJYPS'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 51
@ -661,6 +693,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object TV1Column17: TcxGridDBBandedColumn
        Caption = #26816#39564#25968#37327
        DataBinding.FieldName = 'PBJYQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
@ -671,6 +704,7 @@ inherited frmKnitPlanProgress: TfrmKnitPlanProgress
      object TV1Column1: TcxGridDBBandedColumn
        Caption = #23458#25143
        DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 103
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanProgress.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_KnitPlanProgress.pas
@ -15,7 +15,8 @@ uses
  cxTextEdit, cxDBLookupComboBox, cxGridBandedTableView, cxGridDBBandedTableView,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseHelp, dxSkinsCore,
  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, System.ImageList,
-  Vcl.ImgList, U_BaseList;
+  Vcl.ImgList, U_BaseList, dxSkinWXI, dxScrollbarAnnotations, cxContainer,
+  dxCore, cxDateUtils, cxDropDownEdit;

 type
  TfrmKnitPlanProgress = class(TfrmBaseList)
@ -30,14 +31,14 @@ type
    RM1: TRMGridReport;
    RMDBHZ: TRMDBDataSet;
    Label3: TLabel;
-    C_Name: TEdit;
+    C_Name: TcxTextEdit;
    cxGridPopupMenu2: TcxGridPopupMenu;
    Label1: TLabel;
-    C_Code: TEdit;
-    EndDate: TDateTimePicker;
+    C_Code: TcxTextEdit;
+    EndDate: TcxDateEdit;
    Label4: TLabel;
    Label5: TLabel;
-    Begdate: TDateTimePicker;
+    Begdate: TcxDateEdit;
    cxGrid1: TcxGrid;
    TV1: TcxGridDBBandedTableView;
    cxGridDBBandedColumn35: TcxGridDBBandedColumn;
@ -56,7 +57,7 @@ type
    V1Column5: TcxGridDBBandedColumn;
    V1Column7: TcxGridDBBandedColumn;
    Label6: TLabel;
-    orderno: TEdit;
+    orderno: TcxTextEdit;
    CDSPRTHZ: TClientDataSet;
    CDSPRTMX: TClientDataSet;
    RMDBMX: TRMDBDataSet;
@ -127,8 +128,8 @@ begin
    begin
      Close;
      SQL.Clear;
-      sql.Add(' exec P_Knit_Plan_Progress @Begdate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', Begdate.DateTime))));
-      sql.Add(',@enddate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', EndDate.DateTime + 1))));
+      sql.Add(' exec P_Knit_Plan_Progress @Begdate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', Begdate.Date))));
+      sql.Add(',@enddate=' + quotedstr(trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1))));
      sql.Add(',@criteria= ' + quotedstr(fwhere));
 //      ShowMessage(sql.text);
      Open;
@ -198,8 +199,8 @@ procedure TfrmKnitPlanProgress.FormCreate(Sender: TObject);
 begin
  inherited;
  canshu1 := Trim(DParameters1);
-  EndDate.DateTime := SGetServerDate(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 90;
+  EndDate.Date := SGetServerDate(ADOQueryTemp);
+  BegDate.Date := EndDate.Date - 90;
 end;

 end.
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_MachPlanSet.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_MachPlanSet.dfm
@ -4,23 +4,24 @@ inherited frmMachPlanSet: TfrmMachPlanSet
  Caption = #26426#21488#31649#29702
  ClientHeight = 523
  ClientWidth = 1107
+  ParentFont = True
  KeyPreview = True
  ExplicitWidth = 1123
  ExplicitHeight = 562
  PixelsPerInch = 96
-  TextHeight = 17
+  TextHeight = 13
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1107
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 83
    Caption = 'ToolBar1'
    Color = clSkyBlue
-    Images = DataLink_KnitPlan.ImageList_new32
+    Images = DataLink_KnitPlan.cxImageList_bar
    List = True
    ParentColor = False
    ShowCaptions = True
@ -34,7 +35,7 @@ inherited frmMachPlanSet: TfrmMachPlanSet
      OnClick = TBRafreshClick
    end
    object ToolButton2: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #36807#28388
@ -42,7 +43,7 @@ inherited frmMachPlanSet: TfrmMachPlanSet
      Visible = False
    end
    object ToolButton1: TToolButton
-      Left = 142
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #28165#31354
@ -50,7 +51,7 @@ inherited frmMachPlanSet: TfrmMachPlanSet
      OnClick = ToolButton1Click
    end
    object ToolButton3: TToolButton
-      Left = 213
+      Left = 189
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -58,7 +59,7 @@ inherited frmMachPlanSet: TfrmMachPlanSet
      OnClick = ToolButton3Click
    end
    object TBClose: TToolButton
-      Left = 308
+      Left = 276
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -68,9 +69,9 @@ inherited frmMachPlanSet: TfrmMachPlanSet
  end
  object cxGrid2: TcxGrid [1]
    Left = 0
-    Top = 38
+    Top = 30
    Width = 336
-    Height = 485
+    Height = 493
    Align = alLeft
    TabOrder = 1
    object Tv2: TcxGridDBTableView
@ -120,9 +121,9 @@ inherited frmMachPlanSet: TfrmMachPlanSet
  end
  object cxGrid1: TcxGrid [2]
    Left = 336
-    Top = 38
+    Top = 30
    Width = 771
-    Height = 485
+    Height = 493
    Align = alClient
    TabOrder = 2
    object Tv1: TcxGridDBTableView
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_WageListTKJ.dfm
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_WageListTKJ.dfm
@ -7,19 +7,19 @@ inherited frmWageListTKJ: TfrmWageListTKJ
  ExplicitWidth = 1556
  ExplicitHeight = 601
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 17
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1540
    Height = 31
-    ButtonHeight = 38
-    ButtonWidth = 115
+    ButtonHeight = 30
+    ButtonWidth = 107
    Caption = 'ToolBar1'
    Color = clSkyBlue
-    DisabledImages = DataLink_KnitPlan.ThreeImgList
-    Images = DataLink_KnitPlan.ImageList_new32
+    DisabledImages = DataLink_KnitPlan.cxImageList_bar
+    Images = DataLink_KnitPlan.cxImageList_bar
    List = True
    ParentColor = False
    ShowCaptions = True
@ -33,7 +33,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      OnClick = TBRafreshClick
    end
    object ToolButton2: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #36807#28388
@ -41,7 +41,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      OnClick = ToolButton2Click
    end
    object ToolButton7: TToolButton
-      Left = 142
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #34917#24405#25968#25454
@ -49,10 +49,10 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      OnClick = ToolButton7Click
    end
    object Panel3: TPanel
-      Left = 237
+      Left = 213
      Top = 0
      Width = 164
-      Height = 38
+      Height = 30
      BevelInner = bvRaised
      BevelOuter = bvLowered
      Color = clWhite
@ -62,28 +62,19 @@ inherited frmWageListTKJ: TfrmWageListTKJ
        Left = 4
        Top = 10
        Width = 24
-        Height = 12
+        Height = 17
        Caption = #26085#26399
      end
-      object BLDate: TDateTimePicker
-        Left = 34
-        Top = 6
-        Width = 121
-        Height = 20
-        Date = 44496.000000000000000000
-        Time = 0.771035219906480100
-        TabOrder = 0
-      end
    end
    object ToolButton8: TToolButton
-      Left = 401
+      Left = 377
      Top = 0
      Caption = #21024#38500#34917#24405#25968#25454
      ImageIndex = 3
      OnClick = ToolButton8Click
    end
    object ToolButton5: TToolButton
-      Left = 516
+      Left = 484
      Top = 0
      AutoSize = True
      Caption = #26356#25913#32534#21495
@ -92,7 +83,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      OnClick = ToolButton5Click
    end
    object ToolButton6: TToolButton
-      Left = 611
+      Left = 571
      Top = 0
      AutoSize = True
      Caption = #26356#25913#25377#36710#24037
@ -100,7 +91,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      OnClick = ToolButton6Click
    end
    object ToolButton3: TToolButton
-      Left = 718
+      Left = 670
      Top = 0
      AutoSize = True
      Caption = #26680#23545
@ -108,7 +99,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      OnClick = ToolButton3Click
    end
    object ToolButton4: TToolButton
-      Left = 789
+      Left = 733
      Top = 0
      AutoSize = True
      Caption = #26680#23545#25764#38144
@ -116,7 +107,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      OnClick = ToolButton4Click
    end
    object ToolButton1: TToolButton
-      Left = 884
+      Left = 820
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -124,7 +115,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 955
+      Left = 883
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -147,64 +138,66 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      Left = 415
      Top = 13
      Width = 24
-      Height = 12
+      Height = 17
      Caption = #21697#21517
    end
    object Label1: TLabel
      Left = 271
      Top = 13
      Width = 24
-      Height = 12
+      Height = 17
      Caption = #32534#21495
    end
    object Label2: TLabel
      Left = 547
      Top = 13
      Width = 36
-      Height = 12
+      Height = 17
      Caption = #25377#36710#24037
    end
    object Label4: TLabel
      Left = 22
      Top = 13
      Width = 48
-      Height = 12
+      Height = 17
      Caption = #26597#35810#26085#26399
    end
    object Label5: TLabel
      Left = 691
      Top = 13
      Width = 24
-      Height = 12
+      Height = 17
      Caption = #36710#21495
    end
-    object fabricName: TEdit
+    object fabricName: TcxTextEdit
      Tag = 2
      Left = 441
-      Top = 9
-      Width = 89
-      Height = 20
-      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      Top = 10
+      AutoSize = False
+      ParentFont = False
      TabOrder = 2
-      OnChange = fabricNameChange
-    end
-    object fabricNo: TEdit
-      Tag = 2
-      Left = 295
-      Top = 9
+      Height = 25
      Width = 89
-      Height = 20
-      TabOrder = 1
-      OnChange = fabricNameChange
    end
-    object userName: TEdit
+    object fabricNo: TcxTextEdit
+      Tag = 2
+      Left = 294
+      Top = 10
+      AutoSize = False
+      ParentFont = False
+      TabOrder = 1
+      Height = 25
+      Width = 89
+    end
+    object userName: TcxTextEdit
      Tag = 2
      Left = 585
-      Top = 9
-      Width = 89
-      Height = 20
+      Top = 8
+      AutoSize = False
+      ParentFont = False
      TabOrder = 3
-      OnChange = fabricNameChange
+      Height = 25
+      Width = 89
    end
    object BegDate: TDateTimePicker
      Left = 71
@ -226,15 +219,15 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
      TabOrder = 4
    end
-    object machineNo: TEdit
+    object machineNo: TcxTextEdit
      Tag = 2
      Left = 716
      Top = 9
-      Width = 89
-      Height = 20
-      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      AutoSize = False
+      ParentFont = False
      TabOrder = 5
-      OnChange = fabricNameChange
+      Height = 25
+      Width = 89
    end
  end
  object cxGrid2: TcxGrid [2]
@ -245,11 +238,11 @@ inherited frmWageListTKJ: TfrmWageListTKJ
    Align = alClient
    PopupMenu = PopupMenu2
    TabOrder = 2
-    ExplicitTop = 93
    object Tv2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
      Navigator.Buttons.Delete.Enabled = False
      Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_HZ
      DataController.Summary.DefaultGroupSummaryItems = <>
      DataController.Summary.FooterSummaryItems = <
@ -323,6 +316,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column8: TcxGridDBColumn
        Caption = #36873#25321
        DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCheckBoxProperties'
        Properties.ImmediatePost = True
        HeaderAlignmentHorz = taCenter
@ -331,6 +325,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column3: TcxGridDBColumn
        Caption = #26085#26399
        DataBinding.FieldName = 'scheduleDay'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxDateEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -339,6 +334,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column2: TcxGridDBColumn
        Caption = #32534#21495
        DataBinding.FieldName = 'fabricNo'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -347,6 +343,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column6: TcxGridDBColumn
        Caption = #21697#21517
        DataBinding.FieldName = 'fabricName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 113
@ -354,6 +351,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column19: TcxGridDBColumn
        Caption = #25377#36710#24037
        DataBinding.FieldName = 'userName'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxButtonEditProperties'
        Properties.Buttons = <
          item
@ -368,6 +366,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column10: TcxGridDBColumn
        Caption = #36710#21495
        DataBinding.FieldName = 'machineNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 67
@ -375,6 +374,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column11: TcxGridDBColumn
        Caption = #26426#36895
        DataBinding.FieldName = 'speedSp'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 77
@ -382,6 +382,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column7: TcxGridDBColumn
        Caption = #19978#29677#26102#38388
        DataBinding.FieldName = 'uptime'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 193
@ -389,6 +390,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column9: TcxGridDBColumn
        Caption = #19979#29677#26102#38388
        DataBinding.FieldName = 'downtime'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 176
@ -396,6 +398,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object Tv2Column1: TcxGridDBColumn
        Caption = #29983#20135#26465#25968
        DataBinding.FieldName = 'productionNumber'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 97
@ -403,6 +406,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column18: TcxGridDBColumn
        Caption = #39134#26797#36716#25968
        DataBinding.FieldName = 'machineCycleNumber'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 71
@ -410,6 +414,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column12: TcxGridDBColumn
        Caption = #26410#35745#22280#36716#25968
        DataBinding.FieldName = 'upTimeCycle'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 78
@ -417,6 +422,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column21: TcxGridDBColumn
        Caption = #36716#25968#21152
        DataBinding.FieldName = 'AddQty'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column21PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -425,6 +431,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column22: TcxGridDBColumn
        Caption = #36716#25968#20943
        DataBinding.FieldName = 'DecQty'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column21PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -433,6 +440,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column13: TcxGridDBColumn
        Caption = #26680#31639#36716#25968
        DataBinding.FieldName = 'HSQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 81
@ -440,6 +448,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column5: TcxGridDBColumn
        Caption = #26426#21488#21333#20215
        DataBinding.FieldName = 'processPrice'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -448,6 +457,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column4: TcxGridDBColumn
        Caption = #37329#39069
        DataBinding.FieldName = 'CLMoney'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -456,6 +466,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column14: TcxGridDBColumn
        Caption = #34917#36148
        DataBinding.FieldName = 'BTMoney'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column14PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -464,6 +475,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column15: TcxGridDBColumn
        Caption = #22870#21169
        DataBinding.FieldName = 'JLMoney'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column14PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -472,6 +484,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column16: TcxGridDBColumn
        Caption = #22788#32602
        DataBinding.FieldName = 'CFMoney'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column14PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -480,6 +493,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column20: TcxGridDBColumn
        Caption = #24037#36164
        DataBinding.FieldName = 'GZMoney'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -487,6 +501,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object v2Column17: TcxGridDBColumn
        Caption = #22791#27880
        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v2Column17PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -495,6 +510,7 @@ inherited frmWageListTKJ: TfrmWageListTKJ
      object Tv2Column2: TcxGridDBColumn
        Caption = #22812#29677#34917#36148
        DataBinding.FieldName = 'totalSubsidyPrice'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 68
      end
@ -545,6 +561,27 @@ inherited frmWageListTKJ: TfrmWageListTKJ
    TabOrder = 4
    Visible = False
  end
+  object BLDate: TcxDateEdit [5]
+    Left = 245
+    Top = 7
+    AutoSize = False
+    EditValue = 44496d
+    ParentFont = False
+    Properties.ShowTime = False
+    Style.Font.Charset = ANSI_CHARSET
+    Style.Font.Color = clWindowText
+    Style.Font.Height = -12
+    Style.Font.Name = #24494#36719#38597#40657
+    Style.Font.Style = []
+    Style.LookAndFeel.NativeStyle = True
+    Style.IsFontAssigned = True
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.NativeStyle = True
+    TabOrder = 5
+    Height = 20
+    Width = 110
+  end
  inherited ADOQueryBaseCmd: TADOQuery
    Connection = DataLink_KnitPlan.ADOLink
    Left = 305
--- a/项目代码/RTBasicsV1/D01针织生产计划/U_WageListTKJ.pas
+++ b/项目代码/RTBasicsV1/D01针织生产计划/U_WageListTKJ.pas
@ -14,7 +14,8 @@ uses
  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
  cxTextEdit, cxDBLookupComboBox, cxPC, cxDropDownEdit, Menus, cxLookAndFeels,
  cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, U_BaseList;
+  dxSkinsDefaultPainters, dxDateRanges, U_BaseList, dxSkinWXI,
+  dxScrollbarAnnotations, cxContainer, dxCore, cxDateUtils;

 type
  TfrmWageListTKJ = class(TfrmBaseList)
@ -28,7 +29,7 @@ type
    ADOQueryMain: TADOQuery;
    ToolButton1: TToolButton;
    Label3: TLabel;
-    fabricName: TEdit;
+    fabricName: TcxTextEdit;
    cxGrid2: TcxGrid;
    Tv2: TcxGridDBTableView;
    cxGridLevel1: TcxGridLevel;
@ -39,10 +40,10 @@ type
    v2Column2: TcxGridDBColumn;
    v2Column5: TcxGridDBColumn;
    Label1: TLabel;
-    fabricNo: TEdit;
+    fabricNo: TcxTextEdit;
    v2Column10: TcxGridDBColumn;
    Label2: TLabel;
-    userName: TEdit;
+    userName: TcxTextEdit;
    v2Column17: TcxGridDBColumn;
    v2Column18: TcxGridDBColumn;
    v2Column19: TcxGridDBColumn;
@ -63,7 +64,7 @@ type
    v2Column20: TcxGridDBColumn;
    cxTabControl1: TcxTabControl;
    Label5: TLabel;
-    machineNo: TEdit;
+    machineNo: TcxTextEdit;
    v2Column7: TcxGridDBColumn;
    v2Column9: TcxGridDBColumn;
    ToolButton5: TToolButton;
@ -78,10 +79,10 @@ type
    ToolButton7: TToolButton;
    Panel3: TPanel;
    Label8: TLabel;
-    BLDate: TDateTimePicker;
    ToolButton8: TToolButton;
    Tv2Column1: TcxGridDBColumn;
    Tv2Column2: TcxGridDBColumn;
+    BLDate: TcxDateEdit;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
--- a/项目代码/RTBasicsV1/D01针织生产计划/testDll.dpr
+++ b/项目代码/RTBasicsV1/D01针织生产计划/testDll.dpr
@ -1,14 +1,19 @@
 program testDll;
-
 uses
  Forms,
-  U_testdll in 'U_testdll.pas' {Form1};
+  U_testdll in 'U_testdll.pas' {Form1},
+  U_KnitPlanList in 'U_KnitPlanList.pas' {frmKnitPlanList},
+  U_BaseList in '..\..\..\public10\design\U_BaseList.pas' {frmBaseList},
+  U_cxGridCustomCss in '..\..\..\public10\design\U_cxGridCustomCss.pas',
+  U_cxGridCustomSet in '..\..\..\public10\design\U_cxGridCustomSet.pas',
+  U_FormLayOutDesign in '..\..\..\public10\design\U_FormLayOutDesign.pas',
+  U_globalVar in '..\..\..\public10\design\U_globalVar.pas',
+  U_WindowFormdesign in '..\..\..\public10\design\U_WindowFormdesign.pas',
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};

 {$R *.res}
-
 begin
  Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
-  Application.Run;
+  AApplication.CreateForm(TForm1, Form1);
+  pplication.Run;
 end.
-
--- a/项目代码/RTBasicsV1/D01针织生产计划/testDll.dproj
+++ b/项目代码/RTBasicsV1/D01针织生产计划/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>
@ -147,6 +147,24 @@
        <DCCReference Include="U_testdll.pas">
            <Form>Form1</Form>
        </DCCReference>
+        <DCCReference Include="U_KnitPlanList.pas">
+            <Form>frmKnitPlanList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseList.pas">
+            <Form>frmBaseList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_cxGridCustomCss.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_cxGridCustomSet.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_FormLayOutDesign.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_globalVar.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_WindowFormdesign.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
+            <Form>BaseDataLink</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
        <BuildConfiguration Include="Debug">
            <Key>Cfg_2</Key>
            <CfgParent>Base</CfgParent>
@ -176,9 +194,788 @@
                <Platform value="Win32">True</Platform>
                <Platform value="Win64">False</Platform>
            </Platforms>
+            <Deployment Version="3">
+                <DeployFile LocalName="testDll.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>testDll.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployClass Name="AdditionalDebugSymbols">
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidClassesDexFile">
+                    <Platform Name="Android">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidFileProvider">
+                    <Platform Name="Android">
+                        <RemoteDir>res\xml</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\xml</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidGDBServer">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeArmeabiFile">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeArmeabiv7aFile">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeMipsFile">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\mips</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\mips</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidServiceOutput">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidServiceOutput_Android32">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashImageDef">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashStyles">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV21">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_Colors">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_DefaultAppIcon">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon144">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon192">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon36">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-ldpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-ldpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon48">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon72">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon96">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon24">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon36">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon48">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon72">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon96">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage426">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-small</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-small</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage470">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-normal</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-normal</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage640">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage960">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xlarge</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xlarge</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_Strings">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DebugSymbols">
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DependencyFramework">
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Required="true" Name="DependencyPackage">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.bpl</Extensions>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="File">
+                    <Platform Name="Android">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iOS_AppStore1024">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon152">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon167">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Launch2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_LaunchDark2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Notification40">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Setting58">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_SpotLight80">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon120">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon180">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch3x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark3x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Notification40">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Notification60">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting58">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting87">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight120">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight80">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectAndroidManifest">
+                    <Platform Name="Android">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceDebug">
+                    <Platform Name="iOSDevice32">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSEntitlements">
+                    <Platform Name="iOSDevice32">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSInfoPList">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSLaunchScreen">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSResource">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXDebug">
+                    <Platform Name="OSX64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXEntitlements">
+                    <Platform Name="OSX32">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXInfoPList">
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXResource">
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Required="true" Name="ProjectOutput">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Linux64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOutput_Android32">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectUWPManifest">
+                    <Platform Name="Win32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo150">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo44">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
+            </Deployment>
        </BorlandProject>
        <ProjectFileVersion>12</ProjectFileVersion>
    </ProjectExtensions>
    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
+    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
 </Project>
--- a/项目代码/RTBasicsV1/D01针织生产计划/testDll.identcache
+++ b/项目代码/RTBasicsV1/D01针织生产计划/testDll.identcache
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.dpr
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.dpr
@ -7,15 +7,6 @@ uses
  WinTypes,
  WinProcs,
  midaslib,
-  U_GetDllForm in 'U_GetDllForm.pas',
-  U_DataLink in 'U_DataLink.pas' {DataLink_KnitClothStk: TDataModule},
-  U_iniParam in 'U_iniParam.pas',
-  U_BaseHelp in '..\..\..\public10\design\U_BaseHelp.pas' {frmBaseHelp},
-  U_BaseInput in '..\..\..\public10\design\U_BaseInput.pas' {frmBaseInput},
-  U_BaseList in '..\..\..\public10\design\U_BaseList.pas' {frmBaseList},
-  U_cxGridCustomCss in '..\..\..\public10\design\U_cxGridCustomCss.pas',
-  U_globalVar in '..\..\..\public10\design\U_globalVar.pas',
-  U_WindowFormdesign in '..\..\..\public10\design\U_WindowFormdesign.pas',
  U_CompressionFun in '..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas',
  U_RTFun in '..\..\..\public10\ThreeFun\Fun\U_RTFun.pas',
  U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp},
@ -28,9 +19,30 @@ uses
  U_KnitPlanSel in 'U_KnitPlanSel.pas' {frmKnitPlanSel},
  U_LabelMapSet in '..\A00Í¨ÓÃ´°Ìå\U_LabelMapSet.pas' {frmLabelMapSet},
  U_LabelPrint in '..\A00Í¨ÓÃ´°Ìå\U_LabelPrint.pas' {frmLabelPrint},
-  U_KnitClothOutEdit in 'U_KnitClothOutEdit.pas' {frmKnitClothOutEdit},
  U_KnitDRQuickSel in 'U_KnitDRQuickSel.pas' {frmKnitDRQuickSel},
-  U_KnitStockTakinglist in 'U_KnitStockTakinglist.pas' {frmKnitStockTakinglist};
+  U_KnitStockTakinglist in 'U_KnitStockTakinglist.pas' {frmKnitStockTakinglist},
+  U_BaseHelp in '..\..\..\public10\design\U_BaseHelp.pas' {frmBaseHelp},
+  U_BaseInput in '..\..\..\public10\design\U_BaseInput.pas' {frmBaseInput},
+  U_BaseList in '..\..\..\public10\design\U_BaseList.pas' {frmBaseList},
+  U_cxGridCustomCss in '..\..\..\public10\design\U_cxGridCustomCss.pas',
+  U_cxGridCustomSet in '..\..\..\public10\design\U_cxGridCustomSet.pas',
+  U_FormLayOutDesign in '..\..\..\public10\design\U_FormLayOutDesign.pas',
+  U_globalVar in '..\..\..\public10\design\U_globalVar.pas',
+  U_WindowFormdesign in '..\..\..\public10\design\U_WindowFormdesign.pas',
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule},
+  U_KnitClothOutEdit in 'U_KnitClothOutEdit.pas' {frmKnitClothOutEdit},
+  U_DataLink in 'U_DataLink.pas' {DataLink_KnitClothStk: TDataModule},
+  U_GetDllForm in 'U_GetDllForm.pas',
+  U_iniParam in 'U_iniParam.pas',
+  U_KnitClothDROutEdit in 'U_KnitClothDROutEdit.pas' {frmKnitClothDROutEdit},
+  U_KnitClothInEdit in 'U_KnitClothInEdit.pas' {frmKnitClothInEdit},
+  U_KnitClothInList in 'U_KnitClothInList.pas' {frmKnitClothInList},
+  FrameDateSel in '..\A00Í¨ÓÃ×é¼þ\FrameDateSel.pas' {frmFrameDateSel: TFrame},
+  FramePagingSel in '..\A00Í¨ÓÃ×é¼þ\FramePagingSel.pas' {frmFramePagingSel: TFrame},
+  U_KnitClothOutList in 'U_KnitClothOutList.pas' {frmKnitClothOutList},
+  U_KnitClothStkList in 'U_KnitClothStkList.pas' {frmKnitClothStkList},
+  U_KnitDRtInPut in 'U_KnitDRtInPut.pas' {frmKnitDRtInPut},
+  U_KnitClothWaitReleased in 'U_KnitClothWaitReleased.pas' {frmKnitClothWaitReleased};

 {$R *.res}

--- a/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.dproj
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.dproj
@ -124,33 +124,12 @@
    </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:\Dp10RepoV1\项目代码\同甘\D03针织坯布仓库\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
            <MainSource>MainSource</MainSource>
        </DelphiCompile>
-        <DCCReference Include="U_GetDllForm.pas"/>
-        <DCCReference Include="U_DataLink.pas">
-            <Form>DataLink_KnitClothStk</Form>
-            <DesignClass>TDataModule</DesignClass>
-        </DCCReference>
-        <DCCReference Include="U_iniParam.pas"/>
-        <DCCReference Include="..\..\..\public10\design\U_BaseHelp.pas">
-            <Form>frmBaseHelp</Form>
-            <FormType>dfm</FormType>
-        </DCCReference>
-        <DCCReference Include="..\..\..\public10\design\U_BaseInput.pas">
-            <Form>frmBaseInput</Form>
-            <FormType>dfm</FormType>
-        </DCCReference>
-        <DCCReference Include="..\..\..\public10\design\U_BaseList.pas">
-            <Form>frmBaseList</Form>
-            <FormType>dfm</FormType>
-        </DCCReference>
-        <DCCReference Include="..\..\..\public10\design\U_cxGridCustomCss.pas"/>
-        <DCCReference Include="..\..\..\public10\design\U_globalVar.pas"/>
-        <DCCReference Include="..\..\..\public10\design\U_WindowFormdesign.pas"/>
        <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>
        <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_RTFun.pas"/>
        <DCCReference Include="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas">
@ -175,36 +154,93 @@
        </DCCReference>
        <DCCReference Include="U_KnitDRQuickInPut.pas">
            <Form>frmKnitDRQuickInPut</Form>
-            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="U_KnitDRList.pas">
            <Form>frmKnitDRList</Form>
-            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="U_KnitPlanSel.pas">
            <Form>frmKnitPlanSel</Form>
-            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="..\A00通用窗体\U_LabelMapSet.pas">
            <Form>frmLabelMapSet</Form>
-            <FormType>dfm</FormType>
        </DCCReference>
        <DCCReference Include="..\A00通用窗体\U_LabelPrint.pas">
            <Form>frmLabelPrint</Form>
-            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_KnitDRQuickSel.pas">
+            <Form>frmKnitDRQuickSel</Form>
+        </DCCReference>
+        <DCCReference Include="U_KnitStockTakinglist.pas">
+            <Form>frmKnitStockTakinglist</Form>
+        </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseHelp.pas">
+            <Form>frmBaseHelp</Form>
+        </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseInput.pas">
+            <Form>frmBaseInput</Form>
+        </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseList.pas">
+            <Form>frmBaseList</Form>
+        </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_cxGridCustomCss.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_cxGridCustomSet.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_FormLayOutDesign.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_globalVar.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_WindowFormdesign.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
+            <Form>BaseDataLink</Form>
+            <DesignClass>TDataModule</DesignClass>
        </DCCReference>
        <DCCReference Include="U_KnitClothOutEdit.pas">
            <Form>frmKnitClothOutEdit</Form>
            <FormType>dfm</FormType>
        </DCCReference>
-        <DCCReference Include="U_KnitDRQuickSel.pas">
-            <Form>frmKnitDRQuickSel</Form>
+        <DCCReference Include="U_DataLink.pas">
+            <Form>DataLink_KnitClothStk</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
+        <DCCReference Include="U_GetDllForm.pas"/>
+        <DCCReference Include="U_iniParam.pas"/>
+        <DCCReference Include="U_KnitClothDROutEdit.pas">
+            <Form>frmKnitClothDROutEdit</Form>
            <FormType>dfm</FormType>
        </DCCReference>
-        <DCCReference Include="U_KnitStockTakinglist.pas">
-            <Form>frmKnitStockTakinglist</Form>
+        <DCCReference Include="U_KnitClothInEdit.pas">
+            <Form>frmKnitClothInEdit</Form>
            <FormType>dfm</FormType>
        </DCCReference>
+        <DCCReference Include="U_KnitClothInList.pas">
+            <Form>frmKnitClothInList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="..\A00通用组件\FrameDateSel.pas">
+            <Form>frmFrameDateSel</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TFrame</DesignClass>
+        </DCCReference>
+        <DCCReference Include="..\A00通用组件\FramePagingSel.pas">
+            <Form>frmFramePagingSel</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TFrame</DesignClass>
+        </DCCReference>
+        <DCCReference Include="U_KnitClothOutList.pas">
+            <Form>frmKnitClothOutList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_KnitClothStkList.pas">
+            <Form>frmKnitClothStkList</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_KnitDRtInPut.pas">
+            <Form>frmKnitDRtInPut</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="U_KnitClothWaitReleased.pas">
+            <Form>frmKnitClothWaitReleased</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <None Include="KnitClothStk.dpr"/>
        <BuildConfiguration Include="Debug">
            <Key>Cfg_2</Key>
            <CfgParent>Base</CfgParent>
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.dproj.local
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.dproj.local
@ -1,54 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.372,D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRtInPut.pas=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRQuickInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.824,C:\Users\Administrator\Desktop\U_TradeClothInList.dfm=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothInList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.607,=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitStockTakinglist.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.057,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.680,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.418,C:\Users\Administrator\Desktop\U_TradeClothOutList.pas=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothOutList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.905,C:\Users\Administrator\Desktop\U_TradeClothStkList.dfm=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothStkList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.132,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.372,D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRtInPut.dfm=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRQuickInPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.418,C:\Users\Administrator\Desktop\U_TradeClothOutList.dfm=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothOutList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.731,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitDRSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.719,D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRSel.pas=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRQuickSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.737,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothOutList.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.038,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.347,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothOutEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.539,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.719,D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRSel.dfm=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRQuickSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.946,=D:\RTFormwork\public10\design\U_BaseDataLink.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.057,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.995,=D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\U_KnitClothDROutEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.012,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothStkList.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.968,=D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\KnitClothStk.dpr</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\U_KnitClothOutList.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_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.824,C:\Users\Administrator\Desktop\U_TradeClothInList.pas=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothInList.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.905,C:\Users\Administrator\Desktop\U_TradeClothStkList.pas=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothStkList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitDRSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.232,=D:\RTFormwork\项目代码\RTBasicsV1\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.307,=D:\RTFormwork\项目代码\RTBasicsV1\A00通用组件\FramePagingSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.418,D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothOutList.dfm=C:\Users\Administrator\Desktop\U_TradeClothOutList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothStkList.dfm=C:\Users\Administrator\Desktop\U_TradeClothStkList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.824,D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothInList.pas=C:\Users\Administrator\Desktop\U_TradeClothInList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.607,=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitStockTakinglist.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.682,=D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\U_KnitClothWaitReleased.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.731,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothInList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.150,=D:\RTFormwork\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.260,=D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\U_KnitClothInList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.372,D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRQuickInPut.pas=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRtInPut.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.347,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothOutEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.012,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.526,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothStkList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothStkList.pas=C:\Users\Administrator\Desktop\U_TradeClothStkList.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.166,=D:\RTFormwork\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.539,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.038,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.418,D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothOutList.pas=C:\Users\Administrator\Desktop\U_TradeClothOutList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.737,=D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothOutList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.132,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.372,D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRQuickInPut.dfm=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRtInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.576,=D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\U_KnitDRtInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.824,D:\Dp10Repo\项目代码\RTBasics\D03针织坯布仓库\U_KnitClothInList.dfm=C:\Users\Administrator\Desktop\U_TradeClothInList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.116,=D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\U_KnitClothStkList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.719,D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRQuickSel.pas=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.719,D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRQuickSel.dfm=D:\Dp10Repo\项目代码\园中圆\D03针织坯布仓库\U_KnitDRSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.768,=D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\U_KnitClothInEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
  </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
    <File Path="android-support-v4.dex.jar"/>
@ -79,7 +92,7 @@
    <File Path="fmx.dex.jar"/>
    <File Path="google-play-billing.dex.jar"/>
    <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\同甘"/>
+    <File Path="..\..\RTBasicsV1"/>
    <File Path="..\A00通用窗体"/>
    <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
    <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
@ -93,7 +106,12 @@
    <File Path="..\A00通用窗体\U_LabelMapSet.dfm"/>
    <File Path="..\A00通用窗体\U_LabelPrint.pas"/>
    <File Path="..\A00通用窗体\U_LabelPrint.dfm"/>
-    <File Path="D:\Dp10RepoV1"/>
+    <File Path="..\A00通用组件"/>
+    <File Path="..\A00通用组件\FrameDateSel.pas"/>
+    <File Path="..\A00通用组件\FrameDateSel.dfm"/>
+    <File Path="..\A00通用组件\FramePagingSel.pas"/>
+    <File Path="..\A00通用组件\FramePagingSel.dfm"/>
+    <File Path="D:\RTFormwork"/>
    <File Path="..\..\..\public10"/>
    <File Path="..\..\..\public10\design"/>
    <File Path="..\..\..\public10\design\U_BaseHelp.pas"/>
@ -105,6 +123,10 @@
    <File Path="..\..\..\public10\design\U_cxGridCustomCss.pas"/>
    <File Path="..\..\..\public10\design\U_globalVar.pas"/>
    <File Path="..\..\..\public10\design\U_WindowFormdesign.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.dfm"/>
+    <File Path="..\..\..\public10\design\U_cxGridCustomSet.pas"/>
+    <File Path="..\..\..\public10\design\U_FormLayOutDesign.pas"/>
    <File Path="..\..\..\public10\ThreeFun"/>
    <File Path="..\..\..\public10\ThreeFun\Form"/>
    <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas"/>
@ -112,8 +134,6 @@
    <File Path="..\..\..\public10\ThreeFun\Fun"/>
    <File Path="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>
    <File Path="..\..\..\public10\ThreeFun\Fun\U_RTFun.pas"/>
-    <File Path="U_DataLink.pas"/>
-    <File Path="U_DataLink.dfm"/>
    <File Path="U_GetDllForm.pas"/>
    <File Path="U_iniParam.pas"/>
    <File Path="U_KnitClothOutEdit.pas"/>
@ -128,5 +148,22 @@
    <File Path="U_KnitPlanSel.dfm"/>
    <File Path="U_KnitStockTakinglist.pas"/>
    <File Path="U_KnitStockTakinglist.dfm"/>
+    <File Path="U_DataLink.pas"/>
+    <File Path="U_DataLink.dfm"/>
+    <File Path="U_KnitClothInEdit.pas"/>
+    <File Path="U_KnitClothInEdit.dfm"/>
+    <File Path="U_KnitClothDROutEdit.pas"/>
+    <File Path="U_KnitClothDROutEdit.dfm"/>
+    <File Path="U_KnitClothInList.pas"/>
+    <File Path="U_KnitClothInList.dfm"/>
+    <File Path="KnitClothStk.dpr"/>
+    <File Path="U_KnitClothOutList.pas"/>
+    <File Path="U_KnitClothOutList.dfm"/>
+    <File Path="U_KnitClothStkList.pas"/>
+    <File Path="U_KnitClothStkList.dfm"/>
+    <File Path="U_KnitDRtInPut.pas"/>
+    <File Path="U_KnitDRtInPut.dfm"/>
+    <File Path="U_KnitClothWaitReleased.pas"/>
+    <File Path="U_KnitClothWaitReleased.dfm"/>
  </ProjectSortOrder>
 </BorlandProject>
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.identcache
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.identcache
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.skincfg
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/KnitClothStk.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
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/ProjectGroup1.groupproj.local
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/ProjectGroup1.groupproj.local
@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10Repo\项目代码\共佳\D03针织坯布仓库\KnitClothStk.dproj"/>
+		<Projects ActiveProject="D:\RTFormwork\项目代码\RTBasicsV1\D03针织坯布仓库\KnitClothStk.dproj"/>
 	</Default.Personality>
 </BorlandProject>
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_DataLink.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_DataLink.dfm
@ -1,9 +1,25 @@
-object DataLink_KnitClothStk: TDataLink_KnitClothStk
-  OldCreateOrder = False
-  OnCreate = DataModuleCreate
+inherited DataLink_KnitClothStk: TDataLink_KnitClothStk
+  OldCreateOrder = True
  OnDestroy = DataModuleDestroy
-  Height = 349
-  Width = 482
+  Height = 350
+  Width = 455
+  inherited cxEditStyleController1: TcxEditStyleController
+    PixelsPerInch = 96
+  end
+  inherited cxDefaultEditStyleController1: TcxDefaultEditStyleController
+    PixelsPerInch = 96
+  end
+  inherited cxImageList_bar: TcxImageList
+    FormatVersion = 1
+  end
+  inherited ThreeColorBase: TcxStyleRepository
+    PixelsPerInch = 96
+  end
+  inherited dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
+    inherited dxLayoutSkinLookAndFeel1: TdxLayoutSkinLookAndFeel
+      PixelsPerInch = 96
+    end
+  end
  object AdoDataLink: TADOQuery
    Connection = ADOLink
    Parameters = <>
@ -18,8 +34,8 @@ object DataLink_KnitClothStk: TDataLink_KnitClothStk
  object ThreeImgList: TImageList
    Height = 24
    Width = 24
-    Left = 48
-    Top = 96
+    Left = 56
+    Top = 120
    Bitmap = {
      494C01018900F000040018001800FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
      00000000000036000000280000006000000048030000010020000000000000EC
@ -10423,151 +10439,18 @@ object DataLink_KnitClothStk: TDataLink_KnitClothStk
      FF800001000000F003FFFE00FFE0000300000000000000000000000000000000
      000000000000}
  end
-  object ThreeLookAndFeelCol: TcxLookAndFeelController
-    Kind = lfStandard
-    NativeStyle = False
-    Left = 253
-    Top = 12
-  end
-  object ThreeColorBase: TcxStyleRepository
-    Left = 147
-    Top = 80
-    PixelsPerInch = 96
-    object SHuangSe: TcxStyle
-      AssignedValues = [svColor, svFont, svTextColor]
-      Color = 4707838
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      TextColor = clBtnText
-    end
-    object SkyBlue: TcxStyle
-      AssignedValues = [svColor, svFont, svTextColor]
-      Color = clSkyBlue
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      TextColor = clBlack
-    end
-    object Default: TcxStyle
-      AssignedValues = [svFont]
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-    end
-    object QHuangSe: TcxStyle
-      AssignedValues = [svColor, svFont]
-      Color = 8454143
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-    end
-    object Red: TcxStyle
-      AssignedValues = [svColor, svFont]
-      Color = clRed
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-    end
-    object FontBlue: TcxStyle
-      AssignedValues = [svFont, svTextColor]
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clBlue
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      TextColor = clBlue
-    end
-    object TextSHuangSe: TcxStyle
-      AssignedValues = [svFont, svTextColor]
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      TextColor = clOlive
-    end
-    object FonePurple: TcxStyle
-      AssignedValues = [svFont, svTextColor]
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindow
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      TextColor = clPurple
-    end
-    object FoneClMaroon: TcxStyle
-      AssignedValues = [svFont, svTextColor]
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      TextColor = clMaroon
-    end
-    object FoneRed: TcxStyle
-      AssignedValues = [svFont, svTextColor]
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      TextColor = clRed
-    end
-    object RowColor: TcxStyle
-      AssignedValues = [svColor]
-      Color = 16311512
-    end
-    object handBlack: TcxStyle
-      AssignedValues = [svFont]
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-    end
-    object cxBlue: TcxStyle
-      AssignedValues = [svColor, svFont]
-      Color = 16711731
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-    end
-    object SHuangSeCu: TcxStyle
-      AssignedValues = [svColor, svFont, svTextColor]
-      Color = 4707838
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clBlack
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      TextColor = clRed
-    end
-  end
  object Timer_link: TTimer
    Interval = 15000
    OnTimer = Timer_linkTimer
-    Left = 248
-    Top = 92
+    Left = 200
+    Top = 68
  end
  object ImageList_new32: TImageList
    DrawingStyle = dsTransparent
    Height = 32
    Width = 32
-    Left = 256
-    Top = 184
+    Left = 192
+    Top = 208
    Bitmap = {
      494C010119002400040020002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
      000000000000360000002800000080000000E0000000010020000000000000C0
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_DataLink.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_DataLink.pas
@ -5,7 +5,26 @@ interface
 uses
  SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
  Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList;
+  U_BaseDataLink,
+  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, dxCore, cxLocalization,
+  dxLayoutLookAndFeels, cxImageList, cxGraphics, cxEdit, cxContainer,
+  dxSkinsForm;

 type
  TMyThread = class(TThread)
@ -37,26 +56,10 @@ var
  UserDataFlag: string;

 type
-  TDataLink_KnitClothStk = class(TDataModule)
+  TDataLink_KnitClothStk = class(TBaseDataLink)
    AdoDataLink: TADOQuery;
    ADOLink: TADOConnection;
    ThreeImgList: TImageList;
-    ThreeLookAndFeelCol: TcxLookAndFeelController;
-    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;
    Timer_link: TTimer;
    ImageList_new32: TImageList;
    procedure DataModuleDestroy(Sender: TObject);
@ -109,6 +112,7 @@ end;

 procedure TDataLink_KnitClothStk.DataModuleDestroy(Sender: TObject);
 begin
+inherited;
  CriticalSection.Free;
  DataLink_KnitClothStk := nil;
 end;
@ -120,6 +124,7 @@ end;

 procedure TDataLink_KnitClothStk.DataModuleCreate(Sender: TObject);
 begin
+inherited;
  CriticalSection := TCriticalSection.Create;
 end;

--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothDROutEdit.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothDROutEdit.dfm
@ -4,13 +4,17 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
  Caption = #25104#21697#20986#24211#25195#25551'('#30003#35831')'
  ClientHeight = 705
  ClientWidth = 1133
+  ParentFont = False
+  Font.Charset = ANSI_CHARSET
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
  FormStyle = fsMDIChild
  Position = poScreenCenter
  Visible = True
  ExplicitWidth = 1149
  ExplicitHeight = 744
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 21
  object Panel2: TPanel [0]
    Left = 0
    Top = 0
@ -22,43 +26,25 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
    Color = clSkyBlue
    TabOrder = 0
    object Label5: TLabel
-      Left = 6
-      Top = 34
-      Width = 80
-      Height = 19
+      Left = 22
+      Top = 32
+      Width = 64
+      Height = 21
      Caption = #20986#24211#21333#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clBlack
-      Font.Height = -19
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label4: TLabel
-      Left = 6
-      Top = 91
-      Width = 80
-      Height = 19
+      Left = 22
+      Top = 87
+      Width = 64
+      Height = 21
      Caption = #20986#24211#26102#38388
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -19
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label9: TLabel
-      Left = 254
-      Top = 91
-      Width = 73
-      Height = 19
+      Left = 291
+      Top = 87
+      Width = 47
+      Height = 21
      Caption = #23458'   '#25143
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clBlack
-      Font.Height = -19
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label12: TLabel
      Left = 517
@ -74,7 +60,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
      ParentFont = False
    end
    object Label10: TLabel
-      Left = 64
+      Left = 68
      Top = 120
      Width = 196
      Height = 48
@ -87,142 +73,110 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
      ParentFont = False
      Visible = False
    end
-    object edtScan: TEdit
+    object edtScan: TcxTextEdit
      Left = 589
-      Top = 8
-      Width = 411
-      Height = 72
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -64
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-      TabOrder = 3
-      OnKeyPress = edtScanKeyPress
-    end
-    object CRTime: TDateTimePicker
-      Left = 86
-      Top = 86
-      Width = 153
-      Height = 28
-      Date = 41337.000000000000000000
-      Time = 0.663190821760508700
-      Enabled = False
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -20
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-      TabOrder = 0
-    end
-    object ToCoName: TEdit
-      Tag = 2
-      Left = 344
-      Top = 86
-      Width = 154
-      Height = 28
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -20
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-      ReadOnly = True
-      TabOrder = 1
-    end
-    object Button2: TButton
-      Left = 900
-      Top = 86
-      Width = 100
-      Height = 76
-      Caption = #20851#38381
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -29
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-      TabOrder = 5
-      OnClick = Button2Click
-    end
-    object CRType: TEdit
-      Tag = 2
-      Left = 344
-      Top = 130
-      Width = 154
-      Height = 28
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -20
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-      ReadOnly = True
+      Top = 27
+      ParentColor = True
      TabOrder = 2
-      Visible = False
+      OnKeyPress = edtScanKeyPress
+      Width = 411
    end
-    object Button1: TButton
+    object ToCoName: TcxTextEdit
+      Tag = 2
+      Left = 344
+      Top = 81
+      ParentColor = True
+      TabOrder = 0
+      Width = 154
+    end
+    object CRType: TcxTextEdit
+      Tag = 2
+      Left = 344
+      Top = 128
+      ParentColor = True
+      TabOrder = 1
+      Visible = False
+      Width = 154
+    end
+    object edtIsSMTH: TcxTextEdit
+      Left = 24
+      Top = 128
+      ParentColor = True
+      TabOrder = 3
+      Visible = False
+      OnClick = edtIsSMTHClick
+      Width = 33
+    end
+    object OutNo: TcxTextEdit
+      Left = 92
+      Top = 27
+      ParentColor = True
+      TabOrder = 4
+      Width = 409
+    end
+    object Button1: TcxButton
      Left = 589
-      Top = 86
+      Top = 84
      Width = 100
      Height = 76
      Caption = #36873#21333
+      LookAndFeel.Kind = lfStandard
+      LookAndFeel.NativeStyle = False
+      LookAndFeel.ScrollMode = scmDefault
+      LookAndFeel.SkinName = 'Office2010Silver'
+      TabOrder = 5
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -29
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
+      Font.Height = -27
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
      ParentFont = False
-      TabOrder = 4
      OnClick = Button1Click
    end
-    object edtIsSMTH: TEdit
-      Left = 23
-      Top = 125
-      Width = 39
-      Height = 37
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -29
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-      ReadOnly = True
-      TabOrder = 6
-      Visible = False
-      OnClick = edtIsSMTHClick
-    end
-    object btn1: TButton
-      Left = 746
-      Top = 86
+    object btn1: TcxButton
+      Left = 745
+      Top = 84
      Width = 100
      Height = 76
      Caption = #24211#23384
+      LookAndFeel.Kind = lfStandard
+      LookAndFeel.NativeStyle = False
+      LookAndFeel.ScrollMode = scmDefault
+      LookAndFeel.SkinName = 'Office2010Silver'
+      TabOrder = 6
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
-      Font.Height = -29
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
+      Font.Height = -27
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
      ParentFont = False
-      TabOrder = 7
-      Visible = False
      OnClick = btn1Click
    end
-    object OutNo: TEdit
-      Left = 89
-      Top = 8
-      Width = 409
-      Height = 72
+    object Button2: TcxButton
+      Left = 900
+      Top = 84
+      Width = 100
+      Height = 76
+      Caption = #20851#38381
+      LookAndFeel.Kind = lfStandard
+      LookAndFeel.NativeStyle = False
+      LookAndFeel.ScrollMode = scmDefault
+      LookAndFeel.SkinName = 'Office2010Silver'
+      TabOrder = 7
      Font.Charset = GB2312_CHARSET
-      Font.Color = clBlue
-      Font.Height = -64
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
+      Font.Color = clWindowText
+      Font.Height = -27
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
      ParentFont = False
-      ReadOnly = True
+      OnClick = Button2Click
+    end
+    object CRTime: TcxDateEdit
+      Left = 92
+      Top = 81
+      ParentColor = True
      TabOrder = 8
+      Width = 141
    end
  end
  object Panel1: TPanel [1]
@ -242,6 +196,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
      TabOrder = 0
      object Tv3: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_MainSel
        DataController.Summary.DefaultGroupSummaryItems = <>
        DataController.Summary.FooterSummaryItems = <
@ -277,12 +232,10 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        OptionsView.Footer = True
        OptionsView.GroupByBox = False
        Styles.Content = cxStyle1
-        Styles.IncSearch = cxStyle1
-        Styles.Header = cxStyle1
-        Styles.Inactive = cxStyle1
        object VC_MJXH: TcxGridDBColumn
          Caption = #21367#21495
          DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 95
@ -290,6 +243,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object v3Column2: TcxGridDBColumn
          Caption = #26465#30721
          DataBinding.FieldName = 'STKID'
+          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          Properties.ReadOnly = True
          HeaderAlignmentHorz = taCenter
@ -298,18 +252,21 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object cv3Column3: TcxGridDBColumn
          Caption = #25209#21495
          DataBinding.FieldName = 'BatchNO'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 98
        end
        object cv3Column4: TcxGridDBColumn
          Caption = #39068#33394
          DataBinding.FieldName = 'P_Color'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 92
        end
        object v3Column1: TcxGridDBColumn
          Caption = #27611#37325
          DataBinding.FieldName = 'GrossWeight'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 75
@ -317,6 +274,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object Tv3Column1: TcxGridDBColumn
          Caption = #31859#25968
          DataBinding.FieldName = 'Meter'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 72
@ -324,6 +282,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object Tv3Column4: TcxGridDBColumn
          Caption = #30721#25968
          DataBinding.FieldName = 'Yardage'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 79
@ -343,6 +302,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
      object TV4: TcxGridDBTableView
        OnMouseDown = TV4MouseDown
        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = ds2
        DataController.Summary.DefaultGroupSummaryItems = <>
        DataController.Summary.FooterSummaryItems = <
@ -363,12 +323,10 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        OptionsView.Footer = True
        OptionsView.GroupByBox = False
        Styles.Content = cxStyle1
-        Styles.IncSearch = cxStyle1
-        Styles.Header = cxStyle1
-        Styles.Inactive = cxStyle1
        object cCXCONNO: TcxGridDBColumn
          Caption = #35745#21010#21333
          DataBinding.FieldName = 'OrderNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 119
@ -376,6 +334,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object TV4Column1: TcxGridDBColumn
          Caption = #21697#21517
          DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 98
@ -383,6 +342,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object cCXCOLOR: TcxGridDBColumn
          Caption = #39068#33394
          DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 95
@ -390,6 +350,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object cV4Column1: TcxGridDBColumn
          Caption = #25209#21495
          DataBinding.FieldName = 'BatchNO'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 91
@ -397,6 +358,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object TV4Column4: TcxGridDBColumn
          Caption = #32455#26426#21495
          DataBinding.FieldName = 'Loom'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 112
@ -404,6 +366,7 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object TV4Column2: TcxGridDBColumn
          Caption = #30003#35831#21305#25968
          DataBinding.FieldName = 'Piece'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 113
@ -411,31 +374,39 @@ inherited frmKnitClothDROutEdit: TfrmKnitClothDROutEdit
        object VC_SQQTY: TcxGridDBColumn
          Caption = #30003#35831#25968#37327
          DataBinding.FieldName = 'Qty'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
+          Styles.GroupSummary = DataLink_KnitClothStk.SHuangSeCu
          Width = 111
        end
        object TV4Column5: TcxGridDBColumn
          Caption = #21333#20301
          DataBinding.FieldName = 'QtyUnit'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
+          Styles.GroupSummary = DataLink_KnitClothStk.SkyBlue
          Width = 109
        end
        object TV4Column3: TcxGridDBColumn
          Caption = #21457#36135#21305#25968
          DataBinding.FieldName = 'DlyPiece'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
+          Styles.GroupSummary = DataLink_KnitClothStk.SHuangSeCu
          Width = 123
        end
        object cCXFHPS: TcxGridDBColumn
          Caption = #21457#36135#25968#37327
          DataBinding.FieldName = 'DlyQty'
+          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxTextEditProperties'
          Properties.ReadOnly = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
+          Styles.GroupSummary = DataLink_KnitClothStk.SHuangSeCu
          Width = 122
        end
      end
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothDROutEdit.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothDROutEdit.pas
@ -11,7 +11,25 @@ uses
  cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, BtnEdit, ShellAPI, cxTextEdit,
  RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, RM_e_Xls,
  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, 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,
+  cxContainer, cxButtons, dxCore, cxDateUtils, cxMaskEdit, cxDropDownEdit,
+  cxCalendar;

 type
  TfrmKnitClothDROutEdit = class(TfrmBaseList)
@ -24,23 +42,19 @@ type
    Label5: TLabel;
    Label4: TLabel;
    Label9: TLabel;
-    edtScan: TEdit;
-    CRTime: TDateTimePicker;
-    ToCoName: TEdit;
-    Button2: TButton;
+    edtScan: TcxTextEdit;
+    ToCoName: TcxTextEdit;
    cxStyleRepository1: TcxStyleRepository;
    cxStyle1: TcxStyle;
    Label12: TLabel;
    CDS_Main: TClientDataSet;
-    CRType: TEdit;
-    Button1: TButton;
+    CRType: TcxTextEdit;
    RMXLSExport1: TRMXLSExport;
    RMDBMX: TRMDBDataSet;
    RM1: TRMGridReport;
    CDS_JuanPRT: TClientDataSet;
    Label10: TLabel;
-    edtIsSMTH: TEdit;
-    btn1: TButton;
+    edtIsSMTH: TcxTextEdit;
    ds1: TClientDataSet;
    ds2: TDataSource;
    Panel1: TPanel;
@ -64,12 +78,16 @@ type
    Tv3Column1: TcxGridDBColumn;
    TV4Column2: TcxGridDBColumn;
    TV4Column3: TcxGridDBColumn;
-    OutNo: TEdit;
+    OutNo: TcxTextEdit;
    GPM_2: TcxGridPopupMenu;
    TV4Column5: TcxGridDBColumn;
    Tv3Column4: TcxGridDBColumn;
    TV4Column4: TcxGridDBColumn;
    Pnl_msg: TPanel;
+    Button1: TcxButton;
+    btn1: TcxButton;
+    Button2: TcxButton;
+    CRTime: TcxDateEdit;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormDestroy(Sender: TObject);
    procedure FormShow(Sender: TObject);
@ -250,7 +268,7 @@ begin

        Sql.Add('exec P_Knit_Cloth_Out ');
        Sql.Add(' @StkIds=' + quotedstr(trim(MStkIds)));
-        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.DateTime)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.Date)));
        Sql.Add(',@IOType=' + Quotedstr(crtype.Text));
        Sql.Add(',@IONO=' + Quotedstr(OutNo.Text));
        Sql.Add(',@FillId=' + Quotedstr(DCode));
@ -343,7 +361,7 @@ begin
  edtScan.SetFocus;
  ReadCxGrid('扫描出库Tv4', Tv4, '发货申请');
  ReadCxGrid('扫描出库Tv3', Tv3, '发货申请');
-  CRTime.DateTime := SGetServerDate(ADOQueryTemp);
+  CRTime.Date := SGetServerDate(ADOQueryTemp);
 end;

 procedure TfrmKnitClothDROutEdit.edtScanKeyPress(Sender: TObject; var Key: Char);
@ -418,6 +436,8 @@ begin

 end;

+
+
 procedure TfrmKnitClothDROutEdit.Button1Click(Sender: TObject);
 var
  MKey: Char;
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInEdit.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInEdit.dfm
@ -1,28 +1,40 @@
 inherited frmKnitClothInEdit: TfrmKnitClothInEdit
  Caption = #25104#21697#20986#24211#25195#25551
-  ClientHeight = 632
+  ClientHeight = 634
  ClientWidth = 1350
+  ParentFont = False
+  Font.Charset = ANSI_CHARSET
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
+  Visible = True
  ExplicitWidth = 1366
-  ExplicitHeight = 671
+  ExplicitHeight = 673
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 21
  object Panel4: TPanel [0]
    Left = 0
    Top = 169
    Width = 609
-    Height = 463
+    Height = 465
    Align = alLeft
    Caption = 'Panel2'
    TabOrder = 2
    object cxGrid1: TcxGrid
      Left = 1
-      Top = 39
+      Top = 31
      Width = 607
-      Height = 423
+      Height = 433
      Align = alClient
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = []
+      ParentFont = False
      TabOrder = 0
      object Tv1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_1
        DataController.Filter.AutoDataSetFilter = True
        DataController.Summary.DefaultGroupSummaryItems = <>
@ -57,6 +69,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v1Column6: TcxGridDBColumn
          Caption = #36873#25321
          DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxCheckBoxProperties'
          Properties.NullStyle = nssUnchecked
          HeaderAlignmentHorz = taCenter
@ -67,12 +80,14 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v1Column11: TcxGridDBColumn
          Caption = #21367#26465#30721
          DataBinding.FieldName = 'StkId'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 75
        end
        object v1Column5: TcxGridDBColumn
          Caption = #21367#21495
          DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -81,6 +96,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v1Column3: TcxGridDBColumn
          Caption = #39068#33394
          DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -89,19 +105,22 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object Tv1Column1: TcxGridDBColumn
          Caption = #33394#21495
          DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 62
        end
        object v1Column4: TcxGridDBColumn
          Caption = #21345#21495
          DataBinding.FieldName = 'PCID'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
-          Width = 41
+          Width = 70
        end
        object v2Column6: TcxGridDBColumn
          Caption = #31859#25968
          DataBinding.FieldName = 'StkMeter'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -110,6 +129,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v2Column5: TcxGridDBColumn
          Caption = #27611#37325
          DataBinding.FieldName = 'StkGrossWeight'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -125,21 +145,16 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
      Left = 1
      Top = 1
      Width = 607
-      Height = 38
+      Height = 30
      AutoSize = True
-      ButtonHeight = 38
-      ButtonWidth = 91
+      ButtonHeight = 30
+      ButtonWidth = 99
      Caption = 'ToolBar1'
      Color = clWhite
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      Images = DataLink_KnitClothStk.ImageList_new32
+      DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+      Images = DataLink_KnitClothStk.cxImageList_bar
      List = True
      ParentColor = False
-      ParentFont = False
      ShowCaptions = True
      TabOrder = 1
      object ToolButton6: TToolButton
@ -192,16 +207,23 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -16
+    Font.Name = #24494#36719#38597#40657
+    Font.Style = []
+    ParentFont = False
    TabOrder = 0
    object cxGrid2: TcxGrid
      Left = 2
      Top = 2
-      Width = 607
+      Width = 631
      Height = 165
      Align = alLeft
      TabOrder = 0
      object Tv2: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
        OnCellDblClick = Tv2CellDblClick
        DataController.DataSource = DS_2
        DataController.Filter.AutoDataSetFilter = True
@ -214,10 +236,10 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        DataController.Summary.SummaryGroups = <>
        OptionsCustomize.ColumnFiltering = False
        OptionsView.GroupByBox = False
-        Styles.Footer = DataLink_KnitClothStk.Default
        object v1OrderNo: TcxGridDBColumn
          Caption = #35745#21010#21333#21495
          DataBinding.FieldName = 'OrderNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -226,13 +248,15 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v2Column2: TcxGridDBColumn
          Caption = #23458#25143
          DataBinding.FieldName = 'CustomerNoName'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
-          Width = 123
+          Width = 69
        end
        object cxGridDBColumn2: TcxGridDBColumn
          Caption = #20135#21697#21517#31216
          DataBinding.FieldName = 'MPRTCodeName'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -241,6 +265,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object cxGridDBColumn3: TcxGridDBColumn
          Caption = #39068#33394
          DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -249,12 +274,14 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object Tv2Column2: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'PCPiece'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 48
        end
        object v1Column10: TcxGridDBColumn
          Caption = #25968#37327
          DataBinding.FieldName = 'PCQty'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Width = 51
@ -262,13 +289,15 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v1Column14: TcxGridDBColumn
          Caption = #21333#20301
          DataBinding.FieldName = 'PCUnit'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
-          Width = 42
+          Width = 78
        end
        object v1PRTMF: TcxGridDBColumn
          Caption = #38376#24133
          DataBinding.FieldName = 'C_Width'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -277,6 +306,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v1PRTKZ: TcxGridDBColumn
          Caption = #20811#37325
          DataBinding.FieldName = 'C_GramWeight'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -288,98 +318,67 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
      end
    end
    object Panel3: TPanel
-      Left = 609
+      Left = 633
      Top = 2
-      Width = 739
+      Width = 715
      Height = 165
      Align = alClient
      TabOrder = 1
      object Label4: TLabel
-        Left = 198
-        Top = 55
-        Width = 48
-        Height = 12
+        Left = 208
+        Top = 54
+        Width = 64
+        Height = 21
        Caption = #20837#24211#26102#38388
      end
      object Label5: TLabel
-        Left = 24
-        Top = 55
-        Width = 48
-        Height = 12
+        Left = 32
+        Top = 54
+        Width = 64
+        Height = 21
        Caption = #20837#24211#21333#21495
      end
      object Label11: TLabel
-        Left = 374
-        Top = 55
-        Width = 48
-        Height = 12
+        Left = 407
+        Top = 54
+        Width = 64
+        Height = 21
        Caption = #20837#24211#31867#22411
      end
      object Label6: TLabel
-        Left = 30
-        Top = 102
-        Width = 66
-        Height = 33
+        Left = 66
+        Top = 111
+        Width = 32
+        Height = 21
        Caption = #25195#25551
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clBlue
-        Font.Height = -32
-        Font.Name = #23435#20307
-        Font.Style = [fsBold]
+      end
+      object InNo: TcxTextEdit
+        Left = 104
+        Top = 49
+        AutoSize = False
        ParentFont = False
-      end
-      object CRTime: TDateTimePicker
-        Left = 246
-        Top = 51
-        Width = 100
-        Height = 20
-        Date = 41337.000000000000000000
-        Format = 'yyyy-MM-dd'
-        Time = 0.663190821760508700
        TabOrder = 0
-      end
-      object InNo: TEdit
-        Left = 78
-        Top = 51
+        Height = 33
        Width = 100
-        Height = 20
-        TabOrder = 1
-      end
-      object CRType: TComboBox
-        Left = 422
-        Top = 51
-        Width = 100
-        Height = 20
-        Style = csDropDownList
-        ItemIndex = 0
-        TabOrder = 2
-        Text = #26816#39564#20837#24211
-        Items.Strings = (
-          #26816#39564#20837#24211
-          #36864#36135#20837#24211)
      end
      object ToolBar3: TToolBar
        Tag = 1
        Left = 1
        Top = 1
-        Width = 737
-        Height = 38
+        Width = 713
+        Height = 30
        AutoSize = True
-        ButtonHeight = 38
-        ButtonWidth = 91
+        ButtonHeight = 30
+        ButtonWidth = 99
        Caption = 'ToolBar1'
        Color = clWhite
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -12
-        Font.Name = #23435#20307
-        Font.Style = []
-        Images = DataLink_KnitClothStk.ImageList_new32
+        DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+        Images = DataLink_KnitClothStk.cxImageList_bar
        List = True
        ParentColor = False
-        ParentFont = False
        ShowCaptions = True
        TabOrder = 3
+        Transparent = True
        object btnGetOutNo: TToolButton
          Left = 0
          Top = 0
@ -397,7 +396,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
          OnClick = ToolButton3Click
        end
        object ToolButton8: TToolButton
-          Left = 166
+          Left = 174
          Top = 0
          AutoSize = True
          Caption = #20445#23384#26684#24335
@ -405,7 +404,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
          OnClick = ToolButton8Click
        end
        object ToolButton7: TToolButton
-          Left = 261
+          Left = 277
          Top = 0
          AutoSize = True
          Caption = #20851#38381
@ -413,19 +412,38 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
          OnClick = ToolButton7Click
        end
      end
-      object edtScan: TEdit
-        Left = 102
-        Top = 82
-        Width = 411
-        Height = 72
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -64
-        Font.Name = #23435#20307
-        Font.Style = []
+      object edtScan: TcxTextEdit
+        Left = 104
+        Top = 106
        ParentFont = False
-        TabOrder = 4
+        TabOrder = 1
        OnKeyPress = edtScanKeyPress
+        Width = 497
+      end
+      object CRTime: TcxDateEdit
+        Left = 278
+        Top = 49
+        AutoSize = False
+        EditValue = 45490d
+        ParentFont = False
+        Properties.ShowTime = False
+        TabOrder = 2
+        Height = 33
+        Width = 123
+      end
+      object CRType: TcxComboBox
+        Left = 477
+        Top = 49
+        AutoSize = False
+        ParentFont = False
+        Properties.Items.Strings = (
+          #38144#21806#20837#24211
+          #21152#24037#20837#24211
+          #30424#20111#20837#24211)
+        TabOrder = 4
+        Text = #38144#21806#20837#24211
+        Height = 33
+        Width = 124
      end
    end
  end
@ -433,19 +451,20 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
    Left = 609
    Top = 169
    Width = 741
-    Height = 463
+    Height = 465
    Align = alClient
    Caption = 'Panel2'
    TabOrder = 1
    object cxGrid3: TcxGrid
      Left = 1
-      Top = 39
+      Top = 31
      Width = 739
-      Height = 423
+      Height = 433
      Align = alClient
      TabOrder = 0
      object Tv3: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_3
        DataController.Filter.AutoDataSetFilter = True
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -473,16 +492,18 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v3Column5: TcxGridDBColumn
          Caption = #36873#25321
          DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxCheckBoxProperties'
          Properties.ImmediatePost = True
          Properties.NullStyle = nssUnchecked
          HeaderAlignmentHorz = taCenter
          Options.Sorting = False
-          Width = 44
+          Width = 54
        end
        object cxGridDBColumn4: TcxGridDBColumn
          Caption = #21367#21495
          DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 52
@ -490,13 +511,15 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v3MJID: TcxGridDBColumn
          Caption = #21367#26465#30721
          DataBinding.FieldName = 'StkId'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
-          Width = 60
+          Width = 74
        end
        object v3Column3: TcxGridDBColumn
          Caption = #39068#33394
          DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 66
@ -504,12 +527,14 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object Tv3Column1: TcxGridDBColumn
          Caption = #33394#21495
          DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 67
        end
        object v3Column4: TcxGridDBColumn
          Caption = #21345#21495
          DataBinding.FieldName = 'PCID'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -517,6 +542,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object cxGridDBColumn6: TcxGridDBColumn
          Caption = #31859#25968
          DataBinding.FieldName = 'StkMeter'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Focusing = False
@ -525,6 +551,7 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
        object v3Column1: TcxGridDBColumn
          Caption = #27611#37325
          DataBinding.FieldName = 'StkGrossWeight'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 59
@ -539,21 +566,16 @@ inherited frmKnitClothInEdit: TfrmKnitClothInEdit
      Left = 1
      Top = 1
      Width = 739
-      Height = 38
+      Height = 30
      AutoSize = True
-      ButtonHeight = 38
-      ButtonWidth = 91
+      ButtonHeight = 30
+      ButtonWidth = 99
      Caption = 'ToolBar1'
      Color = clWhite
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      Images = DataLink_KnitClothStk.ImageList_new32
+      DisabledImages = DataLink_KnitClothStk.ImageList_new32
+      Images = DataLink_KnitClothStk.cxImageList_bar
      List = True
      ParentColor = False
-      ParentFont = False
      ShowCaptions = True
      TabOrder = 1
      object ToolButton11: TToolButton
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInEdit.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInEdit.pas
@ -11,7 +11,24 @@ uses
  cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore,
  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
-  RM_GridReport, RM_Dataset, Vcl.ToolWin;
+  RM_GridReport, RM_Dataset, Vcl.ToolWin, 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, cxContainer, cxTextEdit, dxCore,
+  cxDateUtils, cxMaskEdit, cxDropDownEdit, cxCalendar;

 type
  TfrmKnitClothInEdit = class(TfrmBaseList)
@ -71,16 +88,14 @@ type
    Label4: TLabel;
    Label5: TLabel;
    Label11: TLabel;
-    CRTime: TDateTimePicker;
-    InNo: TEdit;
-    CRType: TComboBox;
+    InNo: TcxTextEdit;
    ToolBar3: TToolBar;
    ToolButton3: TToolButton;
    btnGetOutNo: TToolButton;
    ToolButton6: TToolButton;
    ToolButton7: TToolButton;
    ToolButton8: TToolButton;
-    edtScan: TEdit;
+    edtScan: TcxTextEdit;
    Label6: TLabel;
    ToolButton9: TToolButton;
    ToolButton10: TToolButton;
@ -88,6 +103,8 @@ type
    ToolButton12: TToolButton;
    Tv2Column2: TcxGridDBColumn;
    ToolButton4: TToolButton;
+    CRTime: TcxDateEdit;
+    CRType: TcxComboBox;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormDestroy(Sender: TObject);
    procedure FormShow(Sender: TObject);
@ -231,7 +248,7 @@ begin
        Sql.Clear;
        Sql.Add('exec P_Knit_Cloth_In ');
        Sql.Add('@StkIds=' + quotedstr(trim(MStkIds)));
-        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.DateTime)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.Date)));
        Sql.Add(',@IOType=' + Quotedstr(crtype.Text));
        Sql.Add(',@IONO=' + Quotedstr(InNo.Text));
        Sql.Add(',@StkPosition=' + Quotedstr(''));
@ -284,7 +301,7 @@ begin
        Sql.Clear;
        Sql.Add('exec P_Knit_Cloth_In ');
        Sql.Add('@StkIds=' + quotedstr(trim(MStkIds)));
-        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.DateTime)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.Date)));
        Sql.Add(',@IOType=' + Quotedstr(crtype.Text));
        Sql.Add(',@IONO=' + Quotedstr(InNo.Text));
        Sql.Add(',@StkPosition=' + Quotedstr(''));
@ -331,7 +348,7 @@ begin
  InitGrid2();
  InitGrid1();
  InitGrid3();
-  CRTime.DateTime := SGetServerDate(ADOQueryTemp);
+  CRTime.Date := SGetServerDate(ADOQueryTemp);
 end;

 procedure TfrmKnitClothInEdit.Tv2CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
@ -527,7 +544,7 @@ begin
        Sql.Clear;
        Sql.Add('exec P_Knit_Cloth_In ');
        Sql.Add('@StkIds=' + quotedstr(trim(MStkIds)));
-        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.DateTime)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.Date)));
        Sql.Add(',@IOType=' + Quotedstr(crtype.Text));
        Sql.Add(',@IONO=' + Quotedstr(InNo.Text));
        Sql.Add(',@StkPosition=' + Quotedstr(''));
@ -595,7 +612,7 @@ begin
    Exit;
  end;
  InNo.Text := Trim(maxNo);
-  CRTime.DateTime := SGetServerDate(ADOQueryTemp);
+  CRTime.Date := SGetServerDate(ADOQueryTemp);
  InitGrid3();
 end;

--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInEdit.vlb
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInEdit.vlb
@ -0,0 +1,232 @@
+[CDS_3]
+Coordinates=247,10,56,58
+
+[v1OrderNo]
+Coordinates=120,78,77,36
+
+[ToolBar2]
+Coordinates=478,326,67,36
+
+[cxGridDBColumn6]
+Coordinates=662,1,121,36
+
+[cxGrid3]
+Coordinates=409,326,59,36
+
+[InNo]
+Coordinates=357,326,42,36
+
+[Label6]
+Coordinates=184,10,53,58
+
+[cxGridDBColumn4]
+Coordinates=662,56,121,36
+
+[btnGetOutNo]
+Coordinates=257,326,90,36
+
+[GPM_2]
+Coordinates=239,365,58,36
+
+[DS_1]
+Coordinates=485,232,46,36
+
+[Panel4]
+Coordinates=10,212,55,58
+
+[v3Column1]
+Coordinates=662,166,79,36
+
+[Label5]
+Coordinates=437,144,53,58
+
+[v1Column10]
+Coordinates=662,221,86,36
+
+[ADOQueryBaseCmd]
+Coordinates=492,10,133,58
+
+[cxGrid1]
+Coordinates=188,326,59,36
+
+[DS_3]
+Coordinates=56,77,46,36
+
+[ToolButton10]
+Coordinates=87,326,91,36
+
+[ToolBar1]
+Coordinates=10,326,67,36
+
+[ToolButton7]
+Coordinates=549,280,84,36
+
+[Tv2]
+Coordinates=0,137,40,36
+
+[v2Column2]
+Coordinates=573,365,79,36
+
+[GPM_1]
+Coordinates=42,365,58,36
+
+[cxGrid1Level1]
+Coordinates=821,1,97,36
+
+[v1Column6]
+Coordinates=821,56,79,36
+
+[Panel1]
+Coordinates=427,10,55,58
+
+[Tv3]
+Coordinates=0,329,40,36
+
+[ToolButton4]
+Coordinates=455,280,84,36
+
+[ToolButton2]
+Coordinates=361,280,84,36
+
+[v1PRTKZ]
+Coordinates=662,386,70,36
+
+[Panel2]
+Coordinates=223,144,55,58
+
+[ADOQueryMain]
+Coordinates=75,212,105,58
+
+[edtScan]
+Coordinates=80,144,62,58
+
+[ToolButton3]
+Coordinates=267,280,84,36
+
+[ADOQueryCmd]
+Coordinates=313,10,104,58
+
+[v3Column4]
+Coordinates=821,276,79,36
+
+[v1PRTMF]
+Coordinates=643,439,72,36
+
+[v3Column3]
+Coordinates=821,331,79,36
+
+[Label4]
+Coordinates=121,10,53,58
+
+[cxGridDBColumn2]
+Coordinates=821,386,121,36
+
+[CDS_2]
+Coordinates=565,144,56,58
+
+[v3Column5]
+Coordinates=821,441,79,36
+
+[Tv2Column2]
+Coordinates=732,460,87,36
+
+[cxGrid2]
+Coordinates=198,280,59,36
+
+[v1Column3]
+Coordinates=485,460,79,36
+
+[DS_2]
+Coordinates=338,78,46,36
+
+[GPM_3]
+Coordinates=426,439,58,36
+
+[ToolButton6]
+Coordinates=104,280,84,36
+
+[ToolButton8]
+Coordinates=10,280,84,36
+
+[ToolButton12]
+Coordinates=622,212,91,36
+
+[CRTime]
+Coordinates=152,144,61,58
+
+[cxGridDBColumn3]
+Coordinates=20,460,121,36
+
+[Panel3]
+Coordinates=500,144,55,58
+Visible=True
+
+[ToolButton1]
+Coordinates=528,212,84,36
+
+[v3MJID]
+Coordinates=0,403,58,36
+
+[v2Column5]
+Coordinates=980,56,79,36
+
+[ToolBar3]
+Coordinates=451,212,67,36
+
+[cxGrid2Level1]
+Coordinates=980,111,97,36
+
+[cxGridLevel1]
+Coordinates=980,166,90,36
+
+[v1Column11]
+Coordinates=980,221,86,36
+
+[ToolButton9]
+Coordinates=357,212,84,36
+
+[v1Column5]
+Coordinates=980,331,79,36
+
+[Tv1Column1]
+Coordinates=980,386,87,36
+
+[Tv3Column1]
+Coordinates=980,441,87,36
+
+[v2Column6]
+Coordinates=980,496,79,36
+
+[ToolButton11]
+Coordinates=256,212,91,36
+
+[ADOQueryTemp]
+Coordinates=631,144,109,58
+
+[ADOQueryBaseTemp]
+Coordinates=288,144,139,58
+
+[Tv1]
+Coordinates=802,534,40,36
+
+[CDS_1]
+Coordinates=190,212,56,58
+
+[Label11]
+Coordinates=10,144,60,58
+
+[v1Column14]
+Coordinates=891,570,86,36
+
+[v1Column4]
+Coordinates=713,570,79,36
+
+[]
+Coordinates=10,10,101,124
+
+[CRType]
+LayerNames=
+
+[Module Settings]
+ModelLayerNames=1;2;3;4
+
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInList.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInList.dfm
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInList.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInList.pas
@ -13,7 +13,24 @@ 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, 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, cxContainer, FrameDateSel,
+  cxButtons, cxMaskEdit, FramePagingSel;

 type
  TfrmKnitClothInList = class(TfrmBaseList)
@ -38,12 +55,6 @@ type
    cxPageControl1: TcxPageControl;
    cxTabSheet1: TcxTabSheet;
    cxTabSheet2: TcxTabSheet;
-    Panel6: TPanel;
-    Label31: TLabel;
-    LBCPAP: TLabel;
-    BTLP: TButton;
-    BTNP: TButton;
-    TCBNOR: TComboBox;
    Pnl_F1: TPanel;
    Label2: TLabel;
    Label3: TLabel;
@ -58,14 +69,14 @@ type
    begtime: TDateTimePicker;
    endTime: TDateTimePicker;
    chk_F1: TCheckBox;
-    OrderNo: TEdit;
-    conNO: TEdit;
-    STKID: TEdit;
-    C_Name: TEdit;
-    C_Color: TEdit;
-    PCId: TEdit;
-    C_Pattern: TEdit;
-    C_Code: TEdit;
+    OrderNo: TcxTextEdit;
+    conNO: TcxTextEdit;
+    STKID: TcxTextEdit;
+    C_Name: TcxTextEdit;
+    C_Color: TcxTextEdit;
+    PCId: TcxTextEdit;
+    C_Pattern: TcxTextEdit;
+    C_Code: TcxTextEdit;
    Pnl_F2: TPanel;
    Label1: TLabel;
    Label4: TLabel;
@ -78,12 +89,12 @@ type
    DateTimePicker3: TDateTimePicker;
    DateTimePicker4: TDateTimePicker;
    chk_F2: TCheckBox;
-    Edit1: TEdit;
-    Edit2: TEdit;
-    Edit4: TEdit;
-    Edit5: TEdit;
-    Edit7: TEdit;
-    Edit8: TEdit;
+    Edit1: TcxTextEdit;
+    Edit2: TcxTextEdit;
+    Edit4: TcxTextEdit;
+    Edit5: TcxTextEdit;
+    Edit7: TcxTextEdit;
+    Edit8: TcxTextEdit;
    GPM_2: TcxGridPopupMenu;
    CDS_2: TClientDataSet;
    DS_2: TDataSource;
@ -108,11 +119,11 @@ type
    TV2Column2: TcxGridDBColumn;
    TV2Column3: TcxGridDBColumn;
    Label18: TLabel;
-    Edit10: TEdit;
+    Edit10: TcxTextEdit;
    Label8: TLabel;
    Label14: TLabel;
-    Edit3: TEdit;
-    Edit11: TEdit;
+    Edit3: TcxTextEdit;
+    Edit11: TcxTextEdit;
    PM_2: TPopupMenu;
    MenuItem3: TMenuItem;
    cxGrid1: TcxGrid;
@ -151,6 +162,11 @@ type
    TV2Column4: TcxGridDBColumn;
    TV2Column5: TcxGridDBColumn;
    Tv1Column2: TcxGridDBColumn;
+    frmFrameDateSel: TfrmFrameDateSel;
+    frmFrameDateSel2: TfrmFrameDateSel;
+    frmFramePagingSel1: TfrmFramePagingSel;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
@ -237,11 +253,11 @@ procedure TfrmKnitClothInList.FormCreate(Sender: TObject);
 begin
  inherited;
  lstCust := TStringList.Create;
-  EndDate.DateTime := SGetServerDateTime(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 20;
+  frmFrameDateSel.EndDate.Date := SGetServerDateTime(ADOQueryTemp);
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel.EndDate.Date - 20;

-  BegDate2.DateTime := BegDate.DateTime;
-  EndDate2.DateTime := EndDate.DateTime;
+  frmFrameDateSel2.BegDate.Date := frmFrameDateSel.BegDate.Date;
+  frmFrameDateSel2.EndDate.Date := frmFrameDateSel.EndDate.Date;

  FWorkshop := trim(Self.fParameters3);
 end;
@ -257,8 +273,8 @@ begin
      begin
        if chk_F2.Checked then
        begin
-          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate2.DateTime));
-          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate2.DateTime + 1));
+          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel2.BegDate.Date));
+          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel2.enddate.Date + 1));
        end;
        with ADOQueryMain do
        begin
@ -283,8 +299,8 @@ begin
      begin
        if chk_F1.Checked then
        begin
-          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime));
-          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1));
+          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.BegDate.Date));
+          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.enddate.Date + 1));
        end;
        with ADOQueryMain do
        begin
@ -306,7 +322,8 @@ begin
        end;
        SCreateCDS(ADOQueryMain, CDS_1);
        SInitCDSData(ADOQueryMain, CDS_1);
-        LBCPAP.Caption := inttostr(CurrentPage) + '/' + inttostr(ceil(CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber));
+        frmFramePagingSel1.LBDQY.Caption := inttostr(CurrentPage);
+        frmFramePagingSel1.LBZYS.Caption := inttostr(ceil(CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber));
      end;
  end;

@ -488,8 +505,8 @@ end;

 procedure TfrmKnitClothInList.TV2CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
 begin
-  BegDate.DateTime := BegDate2.DateTime;
-  EndDate.DateTime := EndDate2.DateTime;
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel2.BegDate.Date;
+  frmFrameDateSel.EndDate.Date := frmFrameDateSel2.EndDate.Date;
  chk_F2.Checked := chk_F1.Checked;
  cxPageControl1.ActivePageIndex := 1;
  SetStatus();
@ -519,7 +536,7 @@ end;

 procedure TfrmKnitClothInList.TCBNORChange(Sender: TObject);
 begin
-  RecordsNumber := StrToInt(TCBNOR.Text);
+  RecordsNumber := StrToInt(frmFramePagingSel1.TCBNOR.Text);
  CurrentPage := 1;
  InitGrid(SGetHintFilters(Pnl_F1, 1, 2));
 end;
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInList1.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInList1.dfm
@ -10,7 +10,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
  ExplicitWidth = 1560
  ExplicitHeight = 636
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 17
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
@ -106,7 +106,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      Left = 70
      Top = 36
      Width = 12
-      Height = 12
+      Height = 17
      Caption = #33267
    end
    object Label3: TLabel
@ -471,6 +471,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
    ExplicitTop = 131
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_1
      DataController.Filter.AutoDataSetFilter = True
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -542,6 +543,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column22: TcxGridDBColumn
        Caption = #36873#25321
        DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCheckBoxProperties'
        Properties.ImmediatePost = True
        Properties.NullStyle = nssUnchecked
@ -552,6 +554,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column21: TcxGridDBColumn
        Caption = #20837#24211#21333#21495
        DataBinding.FieldName = 'IONO'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 103
@ -559,16 +562,19 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column9: TcxGridDBColumn
        Caption = #20837#24211#26102#38388
        DataBinding.FieldName = 'IOTime'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
      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
@ -576,6 +582,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column1: TcxGridDBColumn
        Caption = #35745#21010#21333#21495
        DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 78
@ -583,6 +590,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column4: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 74
@ -590,6 +598,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column13: TcxGridDBColumn
        Caption = #20135#21697#21517#31216
        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -597,6 +606,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column4: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -604,6 +614,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column18: TcxGridDBColumn
        Caption = #21345#21495
        DataBinding.FieldName = 'PCId'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -611,6 +622,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column23: TcxGridDBColumn
        Caption = #21367#21495
        DataBinding.FieldName = 'PieceNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -618,6 +630,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column8: TcxGridDBColumn
        Caption = #27611#37325
        DataBinding.FieldName = 'GrossWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -625,6 +638,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column27: TcxGridDBColumn
        Caption = #30382#37325
        DataBinding.FieldName = 'Tare'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -632,6 +646,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column28: TcxGridDBColumn
        Caption = #20928#37325
        DataBinding.FieldName = 'NetWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -639,6 +654,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column10: TcxGridDBColumn
        Caption = #31859#25968
        DataBinding.FieldName = 'Meter'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -646,6 +662,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column12: TcxGridDBColumn
        Caption = #24211#20301
        DataBinding.FieldName = 'IOPosition'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 71
@ -653,6 +670,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column10: TcxGridDBColumn
        Caption = #30721#25968
        DataBinding.FieldName = 'Yardage'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -660,6 +678,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column12: TcxGridDBColumn
        Caption = #21697#36136
        DataBinding.FieldName = 'Grade'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -667,6 +686,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column42: TcxGridDBColumn
        Caption = #24635#35760#24405#25968
        DataBinding.FieldName = 'TotalCount'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -674,6 +694,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column6: TcxGridDBColumn
        Caption = #21367#26465#30721
        DataBinding.FieldName = 'CIID'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -681,6 +702,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column7: TcxGridDBColumn
        Caption = #23458#25143#33457#22411
        DataBinding.FieldName = 'C_CustPattern'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -688,6 +710,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column3: TcxGridDBColumn
        Caption = #38376#24133
        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -695,6 +718,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column5: TcxGridDBColumn
        Caption = #20811#37325
        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -702,6 +726,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column34: TcxGridDBColumn
        Caption = #32568#26465#30721
        DataBinding.FieldName = 'BCIOID'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -709,6 +734,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column40: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -716,6 +742,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object v1Column46: TcxGridDBColumn
        Caption = #26816#39564#26426#21488
        DataBinding.FieldName = 'CIMachNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -723,6 +750,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column5: TcxGridDBColumn
        Caption = #21253#21495
        DataBinding.FieldName = 'BAONO'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -730,12 +758,14 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      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
@ -743,6 +773,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column3: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -750,6 +781,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column1: TcxGridDBColumn
        Caption = #27454#21495
        DataBinding.FieldName = 'C_StyleNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -757,6 +789,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column2: TcxGridDBColumn
        Caption = #33521#25991#39068#33394
        DataBinding.FieldName = 'C_EColor'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -764,6 +797,7 @@ inherited frmKnitClothInList: TfrmKnitClothInList
      object Tv1Column6: TcxGridDBColumn
        Caption = #25209#21495
        DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 72
      end
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInList1.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothInList1.pas
@ -13,7 +13,23 @@ 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, 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
  TfrmKnitClothInList = class(TfrmBaseList)
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothOutEdit.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothOutEdit.dfm
@ -2,10 +2,14 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
  Caption = #25104#21697#20986#24211#25195#25551
  ClientHeight = 632
  ClientWidth = 1350
+  ParentFont = False
+  Font.Charset = ANSI_CHARSET
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
  ExplicitWidth = 1366
  ExplicitHeight = 671
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 21
  object Panel4: TPanel [0]
    Left = 0
    Top = 169
@ -16,13 +20,14 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
    TabOrder = 2
    object cxGrid1: TcxGrid
      Left = 1
-      Top = 74
+      Top = 66
      Width = 607
-      Height = 388
+      Height = 396
      Align = alClient
      TabOrder = 0
      object Tv1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_1
        DataController.Filter.AutoDataSetFilter = True
        DataController.Summary.DefaultGroupSummaryItems = <>
@ -55,9 +60,11 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        DataController.Summary.SummaryGroups = <>
        OptionsView.Footer = True
        OptionsView.GroupByBox = False
+        Styles.Header = DataLink_KnitClothStk.Default
        object v1Column6: TcxGridDBColumn
          Caption = #36873#25321
          DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxCheckBoxProperties'
          Properties.NullStyle = nssUnchecked
          HeaderAlignmentHorz = taCenter
@ -68,12 +75,14 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object Tv1Column2: TcxGridDBColumn
          Caption = #26426#21488#21495
          DataBinding.FieldName = 'Loom'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
        end
        object v1Column1: TcxGridDBColumn
          Caption = #35745#21010#21333#21495
          DataBinding.FieldName = 'orderNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -82,6 +91,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v1Column11: TcxGridDBColumn
          Caption = #21367#26465#30721
          DataBinding.FieldName = 'StkId'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 90
@ -89,6 +99,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v1Column5: TcxGridDBColumn
          Caption = #21367#21495
          DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -97,6 +108,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v1Column3: TcxGridDBColumn
          Caption = #39068#33394
          DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -105,12 +117,14 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object Tv1Column1: TcxGridDBColumn
          Caption = #33394#21495
          DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 62
        end
        object v2Column6: TcxGridDBColumn
          Caption = #31859#25968
          DataBinding.FieldName = 'StkMeter'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -119,6 +133,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v2Column5: TcxGridDBColumn
          Caption = #27611#37325
          DataBinding.FieldName = 'StkGrossWeight'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Filtering = False
@ -134,21 +149,16 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
      Left = 1
      Top = 1
      Width = 607
-      Height = 38
+      Height = 30
      AutoSize = True
-      ButtonHeight = 38
-      ButtonWidth = 91
+      ButtonHeight = 30
+      ButtonWidth = 99
      Caption = 'ToolBar1'
      Color = clWhite
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      Images = DataLink_KnitClothStk.ImageList_new32
+      DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+      Images = DataLink_KnitClothStk.cxImageList_bar
      List = True
      ParentColor = False
-      ParentFont = False
      ShowCaptions = True
      TabOrder = 1
      object ToolButton6: TToolButton
@ -194,7 +204,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
    end
    object Pnl_msg: TPanel
      Left = 1
-      Top = 39
+      Top = 31
      Width = 607
      Height = 35
      Align = alTop
@ -227,6 +237,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
      TabOrder = 0
      object Tv2: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
        OnCellDblClick = Tv2CellDblClick
        DataController.DataSource = DS_2
        DataController.Filter.AutoDataSetFilter = True
@ -239,10 +250,10 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        DataController.Summary.SummaryGroups = <>
        OptionsCustomize.ColumnFiltering = False
        OptionsView.GroupByBox = False
-        Styles.Footer = DataLink_KnitClothStk.Default
        object v1OrderNo: TcxGridDBColumn
          Caption = #35745#21010#21333#21495
          DataBinding.FieldName = 'OrderNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -251,6 +262,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v2Column2: TcxGridDBColumn
          Caption = #23458#25143
          DataBinding.FieldName = 'CustomerNoName'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Width = 123
@ -258,6 +270,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object cxGridDBColumn2: TcxGridDBColumn
          Caption = #20135#21697#21517#31216
          DataBinding.FieldName = 'C_Name'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -266,6 +279,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object cxGridDBColumn3: TcxGridDBColumn
          Caption = #39068#33394
          DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -274,12 +288,14 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object Tv2Column2: TcxGridDBColumn
          Caption = #21305#25968
          DataBinding.FieldName = 'ZPPS'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 48
        end
        object v1Column10: TcxGridDBColumn
          Caption = #25968#37327
          DataBinding.FieldName = 'ZPQty'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Width = 51
@ -287,6 +303,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v1PRTKZ: TcxGridDBColumn
          Caption = #20811#37325
          DataBinding.FieldName = 'C_GramWeight'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -295,6 +312,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v1PRTMF: TcxGridDBColumn
          Caption = #38376#24133
          DataBinding.FieldName = 'C_Width'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Options.Sorting = False
@ -303,6 +321,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v1Column14: TcxGridDBColumn
          Caption = #21333#20301
          DataBinding.FieldName = 'OrdUnit'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Focusing = False
          Width = 42
@ -320,29 +339,29 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
      Align = alClient
      TabOrder = 1
      object Label4: TLabel
-        Left = 176
-        Top = 49
-        Width = 48
-        Height = 12
+        Left = 16
+        Top = 103
+        Width = 64
+        Height = 21
        Caption = #20986#24211#26102#38388
      end
      object Label5: TLabel
        Left = 16
        Top = 49
-        Width = 48
-        Height = 12
+        Width = 64
+        Height = 21
        Caption = #20986#24211#21333#21495
      end
      object Label11: TLabel
-        Left = 352
+        Left = 223
        Top = 49
-        Width = 48
-        Height = 12
+        Width = 64
+        Height = 21
        Caption = #20986#24211#31867#22411
      end
      object Label6: TLabel
-        Left = 30
-        Top = 99
+        Left = 222
+        Top = 98
        Width = 66
        Height = 33
        Caption = #25195#25551
@ -354,75 +373,38 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        ParentFont = False
      end
      object Label1: TLabel
-        Left = 520
-        Top = 49
-        Width = 48
-        Height = 12
+        Left = 424
+        Top = 48
+        Width = 64
+        Height = 21
        Caption = #25910#36135#21333#20301
      end
-      object DlyDate: TDateTimePicker
+      object DRMID: TcxTextEdit
        Tag = 8
-        Left = 224
-        Top = 45
-        Width = 100
-        Height = 20
-        Date = 41337.000000000000000000
-        Format = 'yyyy-MM-dd'
-        Time = 0.663190821760508700
+        Left = 86
+        Top = 43
        Enabled = False
+        ParentFont = False
        TabOrder = 0
-      end
-      object DRMID: TEdit
-        Tag = 8
-        Left = 64
-        Top = 45
-        Width = 100
-        Height = 20
-        Enabled = False
-        TabOrder = 1
-      end
-      object OutType: TComboBox
-        Tag = 8
-        Left = 400
-        Top = 45
-        Width = 100
-        Height = 20
-        Style = csDropDownList
-        Enabled = False
-        ItemIndex = 0
-        TabOrder = 2
-        Text = #38144#21806#20986#24211
-        Items.Strings = (
-          #38144#21806#20986#24211
-          #21152#24037#20986#24211
-          #22238#20462#20986#24211
-          #25439#32791#20986#24211
-          #27425#21697#20986#24211
-          #20854#20182#20986#24211
-          #30424#20111#20986#24211)
+        Width = 123
      end
      object ToolBar3: TToolBar
        Tag = 1
        Left = 1
        Top = 1
        Width = 737
-        Height = 38
+        Height = 30
        AutoSize = True
-        ButtonHeight = 38
-        ButtonWidth = 103
+        ButtonHeight = 30
+        ButtonWidth = 115
        Caption = 'ToolBar1'
        Color = clWhite
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -12
-        Font.Name = #23435#20307
-        Font.Style = []
-        Images = DataLink_KnitClothStk.ImageList_new32
+        DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+        Images = DataLink_KnitClothStk.cxImageList_bar
        List = True
        ParentColor = False
-        ParentFont = False
        ShowCaptions = True
-        TabOrder = 3
+        TabOrder = 1
        object btnGetOutNo: TToolButton
          Left = 0
          Top = 0
@ -432,7 +414,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
          OnClick = btnGetOutNoClick
        end
        object ToolButton5: TToolButton
-          Left = 107
+          Left = 119
          Top = 0
          AutoSize = True
          Caption = #36873#25321#20986#24211#21333
@ -440,7 +422,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
          OnClick = ToolButton5Click
        end
        object ToolButton3: TToolButton
-          Left = 214
+          Left = 238
          Top = 0
          AutoSize = True
          Caption = #30721#21333#25171#21360
@ -448,7 +430,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
          OnClick = ToolButton3Click
        end
        object ToolButton8: TToolButton
-          Left = 309
+          Left = 341
          Top = 0
          AutoSize = True
          Caption = #20445#23384#26684#24335
@ -456,7 +438,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
          OnClick = ToolButton8Click
        end
        object ToolButton7: TToolButton
-          Left = 404
+          Left = 444
          Top = 0
          AutoSize = True
          Caption = #20851#38381
@ -464,28 +446,53 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
          OnClick = ToolButton7Click
        end
      end
-      object edtScan: TEdit
-        Left = 102
-        Top = 71
-        Width = 411
-        Height = 72
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -64
-        Font.Name = #23435#20307
-        Font.Style = []
+      object edtScan: TcxTextEdit
+        Left = 294
+        Top = 98
        ParentFont = False
-        TabOrder = 4
+        TabOrder = 2
        OnKeyPress = edtScanKeyPress
+        Width = 411
      end
-      object ToCoName: TEdit
+      object ToCoName: TcxTextEdit
        Tag = 8
-        Left = 568
-        Top = 45
-        Width = 100
-        Height = 20
+        Left = 496
+        Top = 43
        Enabled = False
+        ParentFont = False
+        TabOrder = 3
+        Width = 121
+      end
+      object DlyDate: TcxDateEdit
+        Tag = 8
+        Left = 86
+        Top = 98
+        AutoSize = False
+        EditValue = 45490d
+        ParentFont = False
+        Properties.ShowTime = False
+        TabOrder = 4
+        Height = 33
+        Width = 123
+      end
+      object OutType: TcxComboBox
+        Tag = 8
+        Left = 293
+        Top = 43
+        AutoSize = False
+        ParentFont = False
+        Properties.Items.Strings = (
+          #38144#21806#20986#24211
+          #21152#24037#20986#24211
+          #22238#20462#20986#24211
+          #25439#32791#20986#24211
+          #27425#21697#20986#24211
+          #20854#20182#20986#24211
+          #30424#20111#20986#24211)
        TabOrder = 5
+        Text = #38144#21806#20986#24211
+        Height = 33
+        Width = 124
      end
    end
  end
@ -499,13 +506,14 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
    TabOrder = 1
    object cxGrid3: TcxGrid
      Left = 1
-      Top = 39
+      Top = 31
      Width = 739
-      Height = 423
+      Height = 431
      Align = alClient
      TabOrder = 0
      object Tv3: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
        DataController.DataSource = DS_3
        DataController.Filter.AutoDataSetFilter = True
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -535,6 +543,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v3Column5: TcxGridDBColumn
          Caption = #36873#25321
          DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
          PropertiesClassName = 'TcxCheckBoxProperties'
          Properties.ImmediatePost = True
          Properties.NullStyle = nssUnchecked
@ -545,6 +554,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object cxGridDBColumn1: TcxGridDBColumn
          Caption = #35745#21010#21333#21495
          DataBinding.FieldName = 'orderNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 90
@ -552,6 +562,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object cxGridDBColumn4: TcxGridDBColumn
          Caption = #21367#21495
          DataBinding.FieldName = 'PieceNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 52
@ -559,6 +570,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v3MJID: TcxGridDBColumn
          Caption = #21367#26465#30721
          DataBinding.FieldName = 'StkId'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 60
@ -566,6 +578,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v3Column3: TcxGridDBColumn
          Caption = #39068#33394
          DataBinding.FieldName = 'C_Color'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 66
@ -573,12 +586,14 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object Tv3Column1: TcxGridDBColumn
          Caption = #33394#21495
          DataBinding.FieldName = 'C_ColorNo'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Width = 67
        end
        object v3Column4: TcxGridDBColumn
          Caption = #21345#21495
          DataBinding.FieldName = 'PCID'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 65
@ -586,6 +601,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object cxGridDBColumn6: TcxGridDBColumn
          Caption = #31859#25968
          DataBinding.FieldName = 'StkMeter'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Focusing = False
@ -594,6 +610,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object v3Column1: TcxGridDBColumn
          Caption = #27611#37325
          DataBinding.FieldName = 'StkGrossWeight'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 59
@ -601,6 +618,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object Tv3Column2: TcxGridDBColumn
          Caption = #26102#38388
          DataBinding.FieldName = 'filltime'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Width = 72
@ -608,6 +626,7 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
        object Tv3Column3: TcxGridDBColumn
          Caption = #26426#21488#21495
          DataBinding.FieldName = 'Loom'
+          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
        end
@ -621,21 +640,16 @@ inherited frmKnitClothOutEdit: TfrmKnitClothOutEdit
      Left = 1
      Top = 1
      Width = 739
-      Height = 38
+      Height = 30
      AutoSize = True
-      ButtonHeight = 38
-      ButtonWidth = 91
+      ButtonHeight = 30
+      ButtonWidth = 99
      Caption = 'ToolBar1'
      Color = clWhite
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      Images = DataLink_KnitClothStk.ImageList_new32
+      DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+      Images = DataLink_KnitClothStk.cxImageList_bar
      List = True
      ParentColor = False
-      ParentFont = False
      ShowCaptions = True
      TabOrder = 1
      object ToolButton11: TToolButton
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothOutEdit.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothOutEdit.pas
@ -11,7 +11,24 @@ uses
  cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore,
  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class,
-  RM_GridReport, RM_Dataset, Vcl.ToolWin;
+  RM_GridReport, RM_Dataset, Vcl.ToolWin, 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, cxContainer, cxTextEdit, dxCore,
+  cxDateUtils, cxMaskEdit, cxDropDownEdit, cxCalendar;

 type
  TfrmKnitClothOutEdit = class(TfrmBaseList)
@ -72,16 +89,14 @@ type
    Label4: TLabel;
    Label5: TLabel;
    Label11: TLabel;
-    DlyDate: TDateTimePicker;
-    DRMID: TEdit;
-    OutType: TComboBox;
+    DRMID: TcxTextEdit;
    ToolBar3: TToolBar;
    ToolButton3: TToolButton;
    btnGetOutNo: TToolButton;
    ToolButton6: TToolButton;
    ToolButton7: TToolButton;
    ToolButton8: TToolButton;
-    edtScan: TEdit;
+    edtScan: TcxTextEdit;
    Label6: TLabel;
    ToolButton9: TToolButton;
    ToolButton10: TToolButton;
@ -91,11 +106,13 @@ type
    ToolButton4: TToolButton;
    ToolButton5: TToolButton;
    Label1: TLabel;
-    ToCoName: TEdit;
+    ToCoName: TcxTextEdit;
    Pnl_msg: TPanel;
    Tv3Column2: TcxGridDBColumn;
    Tv1Column2: TcxGridDBColumn;
    Tv3Column3: TcxGridDBColumn;
+    DlyDate: TcxDateEdit;
+    OutType: TcxComboBox;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormDestroy(Sender: TObject);
    procedure FormShow(Sender: TObject);
@ -298,7 +315,7 @@ begin
        sql.Add(')  ');
        Sql.Add('exec P_Knit_Cloth_Out ');
        Sql.Add(' @StkIds=' + quotedstr(trim(MStkIds)));
-        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', DlyDate.DateTime)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', DlyDate.Date)));
        Sql.Add(',@IOType=' + Quotedstr(OutType.Text));
        Sql.Add(',@IONO=' + Quotedstr(DRMID.Text));
        Sql.Add(',@FillId=' + Quotedstr(DCode));
@ -379,7 +396,7 @@ begin

        Sql.Add('exec P_Knit_Cloth_Out ');
        Sql.Add(' @StkIds=' + quotedstr(trim(MStkIds)));
-        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', DlyDate.DateTime)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', DlyDate.Date)));
        Sql.Add(',@IOType=' + Quotedstr(OutType.Text));
        Sql.Add(',@IONO=' + Quotedstr(DRMID.Text));
        Sql.Add(',@FillId=' + Quotedstr(DCode));
@ -425,7 +442,7 @@ begin
  InitGrid2();
  InitGrid1();
  InitGrid3();
-  DlyDate.DateTime := SGetServerDate(ADOQueryTemp);
+  DlyDate.Date := SGetServerDate(ADOQueryTemp);
 end;

 procedure TfrmKnitClothOutEdit.Tv2CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
@ -601,7 +618,7 @@ begin
        sql.Add(')  ');
        Sql.Add('exec P_Knit_Cloth_Out ');
        Sql.Add(' @StkIds=' + quotedstr(trim(MStkIds)));
-        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', DlyDate.DateTime)));
+        Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', DlyDate.Date)));
        Sql.Add(',@IOType=' + Quotedstr(OutType.Text));
        Sql.Add(',@IONO=' + Quotedstr(DRMID.Text));
        Sql.Add(',@FillId=' + Quotedstr(DCode));
@ -796,3 +813,4 @@ end;

 end.

+
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothOutList.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothOutList.dfm
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothOutList.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothOutList.pas
@ -13,7 +13,24 @@ 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, 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, cxContainer, FrameDateSel,
+  cxButtons, cxMaskEdit, FramePagingSel;

 type
  TfrmKnitClothOutList = class(TfrmBaseList)
@ -38,12 +55,6 @@ type
    cxPageControl1: TcxPageControl;
    cxTabSheet1: TcxTabSheet;
    cxTabSheet2: TcxTabSheet;
-    Panel6: TPanel;
-    Label31: TLabel;
-    LBCPAP: TLabel;
-    BTLP: TButton;
-    BTNP: TButton;
-    TCBNOR: TComboBox;
    Pnl_F1: TPanel;
    Label3: TLabel;
    Label7: TLabel;
@ -57,17 +68,17 @@ type
    Label8: TLabel;
    begtime: TDateTimePicker;
    endTime: TDateTimePicker;
-    OrderNo: TEdit;
-    conNO: TEdit;
-    STKID: TEdit;
-    C_Name: TEdit;
-    C_Color: TEdit;
-    C_Pattern: TEdit;
-    C_Code: TEdit;
-    PCId: TEdit;
-    BatchNo: TEdit;
-    CustName: TEdit;
-    IONO: TEdit;
+    OrderNo: TcxTextEdit;
+    conNO: TcxTextEdit;
+    STKID: TcxTextEdit;
+    C_Name: TcxTextEdit;
+    C_Color: TcxTextEdit;
+    C_Pattern: TcxTextEdit;
+    C_Code: TcxTextEdit;
+    PCId: TcxTextEdit;
+    BatchNo: TcxTextEdit;
+    CustName: TcxTextEdit;
+    IONO: TcxTextEdit;
    Pnl_F2: TPanel;
    Label11: TLabel;
    Label12: TLabel;
@ -81,17 +92,17 @@ type
    Label21: TLabel;
    DateTimePicker3: TDateTimePicker;
    DateTimePicker4: TDateTimePicker;
-    Edit1: TEdit;
-    Edit2: TEdit;
-    Edit3: TEdit;
-    Edit4: TEdit;
-    Edit5: TEdit;
-    Edit6: TEdit;
-    Edit7: TEdit;
-    Edit8: TEdit;
-    Edit9: TEdit;
-    Edit10: TEdit;
-    Edit11: TEdit;
+    Edit1: TcxTextEdit;
+    Edit2: TcxTextEdit;
+    Edit3: TcxTextEdit;
+    Edit4: TcxTextEdit;
+    Edit5: TcxTextEdit;
+    Edit6: TcxTextEdit;
+    Edit7: TcxTextEdit;
+    Edit8: TcxTextEdit;
+    Edit9: TcxTextEdit;
+    Edit10: TcxTextEdit;
+    Edit11: TcxTextEdit;
    GPM_2: TcxGridPopupMenu;
    CDS_2: TClientDataSet;
    DS_2: TDataSource;
@ -168,6 +179,11 @@ type
    Tv1Column14: TcxGridDBColumn;
    Tv1Column15: TcxGridDBColumn;
    TV2Column9: TcxGridDBColumn;
+    frmFrameDateSel2: TfrmFrameDateSel;
+    frmFrameDateSel: TfrmFrameDateSel;
+    frmFramePagingSel1: TfrmFramePagingSel;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
@ -255,10 +271,10 @@ procedure TfrmKnitClothOutList.FormCreate(Sender: TObject);
 begin
  inherited;
  lstCust := TStringList.Create;
-  EndDate.DateTime := SGetServerDateTime(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 20;
-  BegDate2.DateTime := BegDate.DateTime;
-  EndDate2.DateTime := EndDate.DateTime;
+  frmFrameDateSel.EndDate.Date := SGetServerDateTime(ADOQueryTemp);
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel.EndDate.Date - 20;
+  frmFrameDateSel2.BegDate.Date := BegDate.DateTime;
+  frmFrameDateSel2.EndDate.Date := EndDate.DateTime;
  FWorkshop := trim(Self.fParameters3);
 end;

@ -273,8 +289,8 @@ begin
      begin
        if chk_F2.Checked then
        begin
-          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate2.DateTime));
-          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate2.DateTime + 1));
+          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel2.BegDate.Date));
+          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel2.enddate.Date + 1));
        end;
        with ADOQueryMain do
        begin
@ -301,8 +317,8 @@ begin
      begin
        if chk_F1.Checked then
        begin
-          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime));
-          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1));
+          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.BegDate.Date));
+          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.enddate.Date + 1));
        end;
        with ADOQueryMain do
        begin
@ -327,7 +343,8 @@ begin
        end;
        SCreateCDS(ADOQueryMain, CDS_1);
        SInitCDSData(ADOQueryMain, CDS_1);
-        LBCPAP.Caption := inttostr(CurrentPage) + '/' + inttostr(ceil(CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber));
+        frmFramePagingSel1.LBDQY.Caption := inttostr(CurrentPage);
+        frmFramePagingSel1.LBZYS.Caption := inttostr(ceil(CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber));
      end;
  end;

@ -371,6 +388,8 @@ begin
  SetStatus();
 end;

+
+
 procedure TfrmKnitClothOutList.TBExportClick(Sender: TObject);
 begin
  if ADOQueryMain.IsEmpty then
@ -527,8 +546,8 @@ end;

 procedure TfrmKnitClothOutList.TV2CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
 begin
-  BegDate.DateTime := BegDate2.DateTime;
-  EndDate.DateTime := EndDate2.DateTime;
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel2.BegDate.Date;
+  frmFrameDateSel.EndDate.Date := frmFrameDateSel2.EndDate.Date;
  chk_F2.Checked := chk_F1.Checked;
  cxPageControl1.ActivePageIndex := 1;
  SetStatus();
@ -551,7 +570,7 @@ end;

 procedure TfrmKnitClothOutList.TCBNORChange(Sender: TObject);
 begin
-  RecordsNumber := StrToInt(TCBNOR.Text);
+  RecordsNumber := StrToInt(frmFramePagingSel1.TCBNOR.Text);
  CurrentPage := 1;
  InitGrid(SGetHintFilters(Pnl_F1, 1, 2));
 end;
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothStkList.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothStkList.dfm
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothStkList.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothStkList.pas
@ -13,7 +13,24 @@ 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, 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, cxContainer, FrameDateSel,
+  cxButtons, cxMaskEdit, FramePagingSel;

 type
  TfrmKnitClothStkList = class(TfrmBaseList)
@ -35,12 +52,6 @@ type
    cxPageControl1: TcxPageControl;
    cxTabSheet1: TcxTabSheet;
    cxTabSheet2: TcxTabSheet;
-    Panel6: TPanel;
-    Label31: TLabel;
-    LBCPAP: TLabel;
-    BTLP: TButton;
-    BTNP: TButton;
-    TCBNOR: TComboBox;
    Pnl_F1: TPanel;
    Label3: TLabel;
    Label7: TLabel;
@ -50,13 +61,13 @@ type
    Label23: TLabel;
    begtime: TDateTimePicker;
    endTime: TDateTimePicker;
-    OrderNo: TEdit;
-    conNO: TEdit;
-    STKID: TEdit;
-    C_Name: TEdit;
-    C_Color: TEdit;
-    PCId: TEdit;
-    C_Code: TEdit;
+    OrderNo: TcxTextEdit;
+    conNO: TcxTextEdit;
+    STKID: TcxTextEdit;
+    C_Name: TcxTextEdit;
+    C_Color: TcxTextEdit;
+    PCId: TcxTextEdit;
+    C_Code: TcxTextEdit;
    Pnl_F2: TPanel;
    DateTimePicker3: TDateTimePicker;
    DateTimePicker4: TDateTimePicker;
@ -91,8 +102,8 @@ type
    TV2Column3: TcxGridDBColumn;
    Label8: TLabel;
    Label14: TLabel;
-    Edit3: TEdit;
-    Edit11: TEdit;
+    Edit3: TcxTextEdit;
+    Edit11: TcxTextEdit;
    PM_2: TPopupMenu;
    MenuItem1: TMenuItem;
    N2: TMenuItem;
@ -138,19 +149,24 @@ type
    Label13: TLabel;
    Label15: TLabel;
    Label16: TLabel;
-    Edit1: TEdit;
-    Edit2: TEdit;
-    Edit4: TEdit;
-    Edit5: TEdit;
-    Edit6: TEdit;
-    Edit7: TEdit;
-    C_Pattern: TEdit;
-    Edit8: TEdit;
-    Edit9: TEdit;
-    Edit10: TEdit;
+    Edit1: TcxTextEdit;
+    Edit2: TcxTextEdit;
+    Edit4: TcxTextEdit;
+    Edit5: TcxTextEdit;
+    Edit6: TcxTextEdit;
+    Edit7: TcxTextEdit;
+    C_Pattern: TcxTextEdit;
+    Edit8: TcxTextEdit;
+    Edit9: TcxTextEdit;
+    Edit10: TcxTextEdit;
    TV2Column6: TcxGridDBColumn;
    TV2Column2: TcxGridDBColumn;
    Tv1Column2: TcxGridDBColumn;
+    frmFrameDateSel2: TfrmFrameDateSel;
+    frmFrameDateSel: TfrmFrameDateSel;
+    frmFramePagingSel1: TfrmFramePagingSel;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormCreate(Sender: TObject);
    procedure TBRafreshClick(Sender: TObject);
@ -225,10 +241,10 @@ procedure TfrmKnitClothStkList.FormCreate(Sender: TObject);
 begin
  inherited;
  lstCust := TStringList.Create;
-  EndDate.DateTime := SGetServerDateTime(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 20;
-  BegDate2.DateTime := BegDate.DateTime;
-  EndDate2.DateTime := EndDate.DateTime;
+  frmFrameDateSel.EndDate.Date := SGetServerDateTime(ADOQueryTemp);
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel.EndDate.Date - 20;
+  frmFrameDateSel2.BegDate.Date := frmFrameDateSel.BegDate.Date;
+  frmFrameDateSel2.EndDate.Date := frmFrameDateSel.EndDate.Date;
  FWorkshop := trim(Self.fParameters3);
 end;

@ -243,8 +259,8 @@ begin
      begin
        if chk_F2.Checked then
        begin
-          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate2.DateTime));
-          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate2.DateTime + 1));
+          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel2.BegDate.Date));
+          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel2.EndDate.Date + 1));
        end;
        with ADOQueryMain do
        begin
@ -272,8 +288,8 @@ begin
      begin
        if chk_F1.Checked then
        begin
-          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime));
-          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1));
+          WSql := WSql + ' and IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.BegDate.Date));
+          WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', frmFrameDateSel.EndDate.Date + 1));
        end;
        with ADOQueryMain do
        begin
@ -296,7 +312,8 @@ begin
        end;
        SCreateCDS(ADOQueryMain, CDS_1);
        SInitCDSData(ADOQueryMain, CDS_1);
-        LBCPAP.Caption := inttostr(CurrentPage) + '/' + inttostr(ceil(CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber));
+        frmFramePagingSel1.LBDQY.Caption := inttostr(CurrentPage);
+        frmFramePagingSel1.LBZYS.Caption := inttostr(ceil(CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber));
        TV1.DataController.Filter.Clear;
      end;
  end;
@ -388,8 +405,8 @@ end;

 procedure TfrmKnitClothStkList.TV2CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
 begin
-  BegDate.DateTime := BegDate2.DateTime;
-  EndDate.DateTime := EndDate2.DateTime;
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel2.BegDate.Date;
+  frmFrameDateSel.EndDate.Date := frmFrameDateSel2.EndDate.Date;
  chk_F2.Checked := chk_F1.Checked;
  cxPageControl1.ActivePageIndex := 1;
  SetStatus();
@ -418,7 +435,7 @@ end;

 procedure TfrmKnitClothStkList.TCBNORChange(Sender: TObject);
 begin
-  RecordsNumber := StrToInt(TCBNOR.Text);
+  RecordsNumber := StrToInt(frmFramePagingSel1.TCBNOR.Text);
  CurrentPage := 1;
  InitGrid(SGetHintFilters(Pnl_F1, 1, 2));
 end;
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothWaitReleased.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothWaitReleased.dfm
@ -7,8 +7,8 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
  Color = clWhite
  Font.Charset = GB2312_CHARSET
  Font.Color = clWindowText
-  Font.Height = -14
-  Font.Name = #23435#20307
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
  Font.Style = []
  OldCreateOrder = False
  Position = poScreenCenter
@ -16,17 +16,20 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
  OnDestroy = FormDestroy
  OnShow = FormShow
  PixelsPerInch = 96
-  TextHeight = 14
+  TextHeight = 21
  object cxGrid1: TcxGrid
    Left = 0
-    Top = 81
+    Top = 75
    Width = 1155
-    Height = 467
+    Height = 473
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 0
+    ExplicitTop = 73
+    ExplicitHeight = 475
    object Tv2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DataSource1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <>
@ -62,6 +65,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object v2Column3: TcxGridDBColumn
        Caption = #36873#20013
        DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCheckBoxProperties'
        Properties.ImmediatePost = True
        Properties.NullStyle = nssUnchecked
@ -71,6 +75,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object v1OrderNo: TcxGridDBColumn
        Caption = #35745#21010#21333#21495
        DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -78,6 +83,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object v2Column2: TcxGridDBColumn
        Caption = #23458#25143
        DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -85,6 +91,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object cxGridDBColumn2: TcxGridDBColumn
        Caption = #20135#21697#21517#31216
        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -92,6 +99,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object cxGridDBColumn3: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -99,6 +107,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object v1Column10: TcxGridDBColumn
        Caption = #25968#37327
        DataBinding.FieldName = 'pcQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -106,6 +115,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object Tv2Column1: TcxGridDBColumn
        Caption = #25104#20998
        DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 87
@ -113,6 +123,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object Tv2Column4: TcxGridDBColumn
        Caption = #35268#26684
        DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 86
@ -120,18 +131,21 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object Tv2Column2: TcxGridDBColumn
        Caption = #38376#24133
        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 67
      end
      object Tv2Column3: TcxGridDBColumn
        Caption = #20811#37325
        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 83
      end
      object v1PRTMF: TcxGridDBColumn
        Caption = #21305#25968
        DataBinding.FieldName = 'ZPPS'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -139,6 +153,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object v1Column14: TcxGridDBColumn
        Caption = #21333#20301
        DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -146,6 +161,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      object v1PRTKZ: TcxGridDBColumn
        Caption = #25968#37327
        DataBinding.FieldName = 'ZPQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -157,60 +173,57 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
  end
  object Panel1: TPanel
    Left = 0
-    Top = 38
+    Top = 30
    Width = 1155
-    Height = 43
+    Height = 45
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
    TabOrder = 1
    object Label2: TLabel
-      Left = 35
-      Top = 15
-      Width = 56
-      Height = 14
+      Left = 27
+      Top = 12
+      Width = 64
+      Height = 21
      Caption = #35745#21010#21333#21495
    end
    object Label3: TLabel
      Left = 432
-      Top = 15
-      Width = 28
-      Height = 14
+      Top = 12
+      Width = 32
+      Height = 21
      Caption = #39068#33394
    end
    object Label8: TLabel
      Left = 255
-      Top = 15
-      Width = 28
-      Height = 14
+      Top = 12
+      Width = 32
+      Height = 21
      Caption = #23458#25143
    end
-    object OrderNo: TEdit
+    object OrderNo: TcxTextEdit
      Tag = 2
      Left = 97
-      Top = 11
-      Width = 121
-      Height = 22
+      Top = 6
+      ParentFont = False
      TabOrder = 0
-      OnChange = OrderNoChange
+      Width = 121
    end
-    object PRTColor: TEdit
+    object PRTColor: TcxTextEdit
      Tag = 2
      Left = 470
-      Top = 11
-      Width = 111
-      Height = 22
+      Top = 6
+      ParentFont = False
      TabOrder = 1
-      OnChange = OrderNoChange
+      Width = 111
    end
-    object CustomerNoName: TEdit
+    object CustomerNoName: TcxTextEdit
      Tag = 2
      Left = 293
-      Top = 11
-      Width = 119
-      Height = 22
+      Top = 6
+      ParentFont = False
      TabOrder = 2
-      OnChange = OrderNoChange
+      Width = 119
    end
  end
  object ToolBar3: TToolBar
@ -218,18 +231,19 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
    Left = 0
    Top = 0
    Width = 1155
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 83
    Caption = 'ToolBar1'
    Color = clWhite
+    DisabledImages = DataLink_KnitClothStk.cxImageList_bar
    Font.Charset = GB2312_CHARSET
    Font.Color = clWindowText
    Font.Height = -12
    Font.Name = #23435#20307
    Font.Style = []
-    Images = DataLink_KnitClothStk.ImageList_new32
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
    ParentFont = False
@ -244,7 +258,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      OnClick = ToolButton5Click
    end
    object ToolButton1: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #30830#23450
@ -252,7 +266,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      OnClick = ToolButton1Click
    end
    object ToolButton8: TToolButton
-      Left = 142
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -260,7 +274,7 @@ object frmKnitClothWaitReleased: TfrmKnitClothWaitReleased
      OnClick = ToolButton8Click
    end
    object ToolButton7: TToolButton
-      Left = 237
+      Left = 213
      Top = 0
      AutoSize = True
      Caption = #20851#38381
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothWaitReleased.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitClothWaitReleased.pas
@ -10,7 +10,23 @@ uses
  cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu,
  cxGridPopupMenu, cxCheckBox, Menus, cxLookAndFeels, cxLookAndFeelPainters,
  cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, Vcl.ToolWin;
+  dxBarBuiltInMenu, Vcl.ToolWin, 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, cxContainer, cxTextEdit;

 type
  TfrmKnitClothWaitReleased = class(TForm)
@ -26,9 +42,9 @@ type
    cxGrid1Level1: TcxGridLevel;
    Panel1: TPanel;
    Label2: TLabel;
-    OrderNo: TEdit;
+    OrderNo: TcxTextEdit;
    Label3: TLabel;
-    PRTColor: TEdit;
+    PRTColor: TcxTextEdit;
    CDS_OrderSel: TClientDataSet;
    DataSource1: TDataSource;
    ADOQueryTemp: TADOQuery;
@ -37,7 +53,7 @@ type
    cxGridPopupMenu1: TcxGridPopupMenu;
    v2Column2: TcxGridDBColumn;
    Label8: TLabel;
-    CustomerNoName: TEdit;
+    CustomerNoName: TcxTextEdit;
    v2Column3: TcxGridDBColumn;
    PopupMenu1: TPopupMenu;
    N1: TMenuItem;
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRList.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRList.dfm
@ -3,36 +3,34 @@ inherited frmKnitDRList: TfrmKnitDRList
  Top = 16
  BorderStyle = bsNone
  Caption = #21457#36135#30003#35831
-  ClientHeight = 532
+  ClientHeight = 688
  ClientWidth = 1453
+  ParentFont = False
+  Font.Charset = ANSI_CHARSET
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
  FormStyle = fsMDIChild
  Position = poScreenCenter
  Visible = True
  ExplicitWidth = 1469
-  ExplicitHeight = 571
+  ExplicitHeight = 727
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 21
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1453
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 99
    Caption = 'ToolBar1'
    Color = clSkyBlue
-    DisabledImages = DataLink_KnitClothStk.ImageList_new32
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -12
-    Font.Name = #23435#20307
-    Font.Style = []
-    Images = DataLink_KnitClothStk.ImageList_new32
+    DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
-    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
    object TBRafresh: TToolButton
@ -108,7 +106,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      OnClick = TnochkClick
    end
    object btnWC: TToolButton
-      Left = 663
+      Left = 671
      Top = 0
      AutoSize = True
      Caption = #23436#25104
@ -116,7 +114,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      OnClick = btnWCClick
    end
    object btnWCCX: TToolButton
-      Left = 734
+      Left = 742
      Top = 0
      AutoSize = True
      Caption = #25764#38144#23436#25104
@ -124,7 +122,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      OnClick = btnWCCXClick
    end
    object TBExport: TToolButton
-      Left = 829
+      Left = 845
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -132,7 +130,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      OnClick = TBExportClick
    end
    object ToolButton6: TToolButton
-      Left = 900
+      Left = 916
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -140,7 +138,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      OnClick = ToolButton6Click
    end
    object TBClose: TToolButton
-      Left = 995
+      Left = 1019
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -150,14 +148,15 @@ inherited frmKnitDRList: TfrmKnitDRList
  end
  object cxGrid1: TcxGrid [1]
    Left = 0
-    Top = 102
+    Top = 136
    Width = 1453
-    Height = 200
+    Height = 328
    Align = alClient
    PopupMenu = PM_1
    TabOrder = 3
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      OnFocusedRecordChanged = Tv1FocusedRecordChanged
      DataController.DataSource = DataSource1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -216,6 +215,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      object v1Column4: TcxGridDBColumn
        Caption = #36873#25321
        DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCheckBoxProperties'
        Properties.ImmediatePost = True
        Properties.MultiLine = True
@ -226,6 +226,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      object v1Column8: TcxGridDBColumn
        Caption = #30003#35831#21333#21495
        DataBinding.FieldName = 'DRMID'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 93
@ -233,6 +234,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      object v1OrdDate: TcxGridDBColumn
        Caption = #30331#35760#26085#26399
        DataBinding.FieldName = 'Filltime'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxDateEditProperties'
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
@ -242,36 +244,42 @@ inherited frmKnitDRList: TfrmKnitDRList
      object v1Column27: TcxGridDBColumn
        Caption = #21457#36135#26085#26399
        DataBinding.FieldName = 'fhDate'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 69
+        Width = 84
      end
      object v1Column10: TcxGridDBColumn
        Caption = #25910#36135#21333#20301
        DataBinding.FieldName = 'ToCoName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 124
      end
      object v1Column1: TcxGridDBColumn
        Caption = #30003#35831#20154
        DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 66
      end
      object v1Column13: TcxGridDBColumn
        Caption = #23457#26680#20154
        DataBinding.FieldName = 'Chker'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 65
      end
      object v1Column17: TcxGridDBColumn
        Caption = #23457#26680#26085#26399
        DataBinding.FieldName = 'ChkTime'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
-        Width = 66
+        Width = 84
      end
      object v1Column7: TcxGridDBColumn
        Caption = #22791#27880
        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v1Column7PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -280,6 +288,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      object Tv1Column1: TcxGridDBColumn
        Caption = #21152#37325
        DataBinding.FieldName = 'DRAddWet'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 75
@ -291,9 +300,9 @@ inherited frmKnitDRList: TfrmKnitDRList
  end
  object Panel1: TPanel [2]
    Left = 0
-    Top = 38
+    Top = 30
    Width = 1453
-    Height = 43
+    Height = 78
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -301,21 +310,15 @@ inherited frmKnitDRList: TfrmKnitDRList
    ParentBackground = False
    TabOrder = 1
    object Label4: TLabel
-      Left = 464
-      Top = 15
-      Width = 48
-      Height = 12
+      Left = 220
+      Top = 40
+      Width = 64
+      Height = 21
      Caption = #25910#36135#21333#20301
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
    end
    object Label8: TLabel
-      Left = 430
-      Top = 99
+      Left = 438
+      Top = 187
      Width = 52
      Height = 12
      Caption = #20135#21697#21517#31216
@ -327,8 +330,8 @@ inherited frmKnitDRList: TfrmKnitDRList
      ParentFont = False
    end
    object Label12: TLabel
-      Left = 303
-      Top = 99
+      Left = 311
+      Top = 187
      Width = 26
      Height = 12
      Caption = #20811#37325
@ -340,8 +343,8 @@ inherited frmKnitDRList: TfrmKnitDRList
      ParentFont = False
    end
    object Label13: TLabel
-      Left = 303
-      Top = 123
+      Left = 311
+      Top = 211
      Width = 26
      Height = 12
      Caption = #38376#24133
@ -352,112 +355,124 @@ inherited frmKnitDRList: TfrmKnitDRList
      Font.Style = [fsBold]
      ParentFont = False
    end
+    object Label1: TLabel
+      Left = 25
+      Top = 40
+      Width = 64
+      Height = 21
+      Caption = #30003#35831#21333#21495
+    end
    object Label2: TLabel
-      Left = 160
-      Top = 15
-      Width = 6
-      Height = 12
+      Left = 444
+      Top = 211
+      Width = 7
+      Height = 21
      Caption = '-'
    end
-    object Label1: TLabel
-      Left = 286
-      Top = 15
-      Width = 48
-      Height = 12
-      Caption = #30003#35831#21333#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-    end
    object BegDate: TDateTimePicker
-      Left = 76
-      Top = 11
+      Left = 596
+      Top = 157
      Width = 85
-      Height = 20
+      Height = 29
      Date = 40675.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.464742650459811600
      TabOrder = 0
    end
    object EndDate: TDateTimePicker
-      Left = 168
-      Top = 11
+      Left = 791
+      Top = 157
      Width = 86
-      Height = 20
+      Height = 29
      Date = 40675.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.464761099538009100
      TabOrder = 1
    end
-    object ToCoName: TEdit
+    object ToCoName: TcxTextEdit
      Tag = 2
-      Left = 518
-      Top = 11
-      Width = 115
-      Height = 20
+      Left = 300
+      Top = 40
+      ParentFont = False
      TabOrder = 2
-      OnChange = ToCoNameChange
+      Width = 115
    end
-    object MPRTCodeName: TEdit
+    object MPRTCodeName: TcxTextEdit
      Tag = 2
-      Left = 483
-      Top = 95
-      Width = 76
-      Height = 20
+      Left = 491
+      Top = 183
+      ParentFont = False
      TabOrder = 4
-      OnChange = ToCoNameChange
+      Width = 76
    end
-    object MPRTKZ: TEdit
+    object MPRTKZ: TcxTextEdit
      Tag = 2
-      Left = 332
-      Top = 95
-      Width = 56
-      Height = 20
+      Left = 340
+      Top = 183
+      ParentFont = False
      TabOrder = 3
-      OnChange = ToCoNameChange
-    end
-    object MPRTMF: TEdit
-      Tag = 2
-      Left = 332
-      Top = 119
      Width = 56
-      Height = 20
+    end
+    object MPRTMF: TcxTextEdit
+      Tag = 2
+      Left = 340
+      Top = 207
+      ParentFont = False
      TabOrder = 5
-      OnChange = ToCoNameChange
+      Width = 56
    end
    object CheckBox1: TCheckBox
-      Left = 9
-      Top = 13
-      Width = 65
+      Left = 596
+      Top = 191
+      Width = 87
      Height = 17
      Caption = #30331#35760#26085#26399
      Checked = True
      State = cbChecked
      TabOrder = 6
    end
-    object DRMID: TEdit
+    object DRMID: TcxTextEdit
      Tag = 2
-      Left = 341
-      Top = 11
-      Width = 99
-      Height = 20
+      Left = 105
+      Top = 40
+      ParentFont = False
      TabOrder = 7
-      OnChange = ToCoNameChange
+      Width = 99
+    end
+    inline frmFrameDateSel: TfrmFrameDateSel
+      Left = 2
+      Top = 2
+      Width = 1449
+      Height = 37
+      Align = alTop
+      Color = clWhite
+      ParentBackground = False
+      ParentColor = False
+      TabOrder = 8
+      ExplicitLeft = 2
+      ExplicitTop = 2
+      ExplicitWidth = 1449
+      inherited BegDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited EndDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited cbbType: TcxComboBox
+        ExplicitHeight = 33
+      end
    end
  end
  object cxTabControl1: TcxTabControl [3]
    Left = 0
-    Top = 81
+    Top = 108
    Width = 1453
-    Height = 21
+    Height = 28
    Align = alTop
    TabOrder = 2
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
-    Properties.TabIndex = 0
+    Properties.TabIndex = 3
    Properties.Tabs.Strings = (
      #26410#23457#26680
      #24050#23457#26680
@ -469,22 +484,22 @@ inherited frmKnitDRList: TfrmKnitDRList
  end
  object cxSplitter1: TcxSplitter [4]
    Left = 0
-    Top = 302
+    Top = 464
    Width = 1453
    Height = 8
    HotZoneClassName = 'TcxMediaPlayer9Style'
    AlignSplitter = salBottom
-    ExplicitWidth = 8
  end
  object cxGrid2: TcxGrid [5]
    Left = 0
-    Top = 310
+    Top = 472
    Width = 1453
-    Height = 222
+    Height = 216
    Align = alBottom
    TabOrder = 5
    object TV2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_2
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <
@ -536,6 +551,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      object cxGridDBColumn1: TcxGridDBColumn
        Caption = #21512#21516#21495
        DataBinding.FieldName = 'SCConNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -543,24 +559,28 @@ inherited frmKnitDRList: TfrmKnitDRList
      object cxGridDBColumn2: TcxGridDBColumn
        Caption = #23458#25143#35746#21333#21495
        DataBinding.FieldName = 'KHConno'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 94
      end
      object cxGridDBColumn3: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 88
      end
      object v1Column6: TcxGridDBColumn
        Caption = #20135#21697#21517#31216
        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 71
      end
      object cxGridDBColumn4: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 73
@ -568,24 +588,28 @@ inherited frmKnitDRList: TfrmKnitDRList
      object cxGridDBColumn5: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 60
      end
      object cxGridDBColumn6: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 71
      end
      object cxGridDBColumn7: TcxGridDBColumn
        Caption = #30003#35831#21305#25968
        DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 81
      end
      object cv1Column3: TcxGridDBColumn
        Caption = #30003#35831#25968#37327
        DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Width = 90
@ -593,34 +617,40 @@ inherited frmKnitDRList: TfrmKnitDRList
      object TV2Column1: TcxGridDBColumn
        Caption = #25968#37327#21333#20301
        DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
      end
      object TV2Column2: TcxGridDBColumn
        Caption = #21457#36135#21305#25968
        DataBinding.FieldName = 'DlyPiece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 70
      end
      object TV2Column3: TcxGridDBColumn
        Caption = #21457#36135#25968#37327
        DataBinding.FieldName = 'DlyQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 80
      end
      object TV2Column4: TcxGridDBColumn
        Caption = #25209#21495
        DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 78
      end
      object TV2Column5: TcxGridDBColumn
        Caption = #32455#26426#21495
        DataBinding.FieldName = 'Loom'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 74
      end
      object TV2Column6: TcxGridDBColumn
        Caption = #35746#21333#21305#25968
        DataBinding.FieldName = 'OrdPiece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 67
@ -628,6 +658,7 @@ inherited frmKnitDRList: TfrmKnitDRList
      object TV2Column7: TcxGridDBColumn
        Caption = #35746#21333#25968#37327
        DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 72
@ -681,7 +712,7 @@ inherited frmKnitDRList: TfrmKnitDRList
  object Order_Main: TClientDataSet
    Aggregates = <>
    Params = <>
-    Left = 816
+    Left = 824
    Top = 136
  end
  object DS_2: TDataSource
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRList.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRList.pas
@ -12,7 +12,23 @@ uses
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
  cxDropDownEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
  dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, U_BaseList,
-  dxDateRanges;
+  dxDateRanges, 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, cxContainer, FrameDateSel;

 type
  TfrmKnitDRList = class(TfrmBaseList)
@ -44,17 +60,16 @@ type
    Label13: TLabel;
    BegDate: TDateTimePicker;
    EndDate: TDateTimePicker;
-    ToCoName: TEdit;
-    MPRTCodeName: TEdit;
-    MPRTKZ: TEdit;
-    MPRTMF: TEdit;
+    ToCoName: TcxTextEdit;
+    MPRTCodeName: TcxTextEdit;
+    MPRTKZ: TcxTextEdit;
+    MPRTMF: TcxTextEdit;
    cxTabControl1: TcxTabControl;
    tchk: TToolButton;
    Tnochk: TToolButton;
    cxSplitter1: TcxSplitter;
    DS_2: TDataSource;
    v1Column8: TcxGridDBColumn;
-    Label2: TLabel;
    ClientDataSet2: TClientDataSet;
    GPM_2: TcxGridPopupMenu;
    v1Column13: TcxGridDBColumn;
@ -91,6 +106,8 @@ type
    Tv1Column1: TcxGridDBColumn;
    TV2Column6: TcxGridDBColumn;
    TV2Column7: TcxGridDBColumn;
+    Label2: TLabel;
+    frmFrameDateSel: TfrmFrameDateSel;
    //RMllPDFExport1: TRMllPDFExport;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
@ -219,8 +236,8 @@ begin
      sql.Add(' from Knit_Cloth_DR_Main A where 1=1');
      if CheckBox1.Checked then
      begin
-        sql.Add(' and Filltime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
-        sql.Add(' and Filltime<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
+        sql.Add(' and Filltime>=''' + FormatDateTime('yyyy-MM-dd', frmFrameDateSel.begdate.Date) + ''' ');
+        sql.Add(' and Filltime<''' + FormatDateTime('yyyy-MM-dd', frmFrameDateSel.Enddate.Date + 1) + ''' ');
      end;
      case cxTabControl1.TabIndex of
        0:
@ -261,8 +278,8 @@ begin
  ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, '·¢»õ¹ÜÀí');
  ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, '·¢»õ¹ÜÀí');

-  EndDate.DateTime := SGetServerDate(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 60;
+  frmFrameDateSel.EndDate.Date := SGetServerDate(ADOQueryTemp);
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel.EndDate.Date - 60;
  InitGrid();

 end;
@ -443,6 +460,7 @@ begin
  SetStatus();
 end;

+
 procedure TfrmKnitDRList.CheckBox1Click(Sender: TObject);
 begin
  InitGrid();
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickInPut.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickInPut.dfm
@ -2,42 +2,36 @@ object frmKnitDRQuickInPut: TfrmKnitDRQuickInPut
  Left = 302
  Top = 139
  Caption = #21457#36135#30003#35831#24405#20837
-  ClientHeight = 280
-  ClientWidth = 484
+  ClientHeight = 272
+  ClientWidth = 503
  Color = clWhite
-  Font.Charset = GB2312_CHARSET
+  Font.Charset = ANSI_CHARSET
  Font.Color = clWindowText
-  Font.Height = -12
-  Font.Name = #23435#20307
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
  Font.Style = []
  OldCreateOrder = True
  Position = poScreenCenter
  OnShow = FormShow
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 21
  object ToolBar1: TToolBar
    Tag = 1
    Left = 0
    Top = 0
-    Width = 484
-    Height = 38
+    Width = 503
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 75
+    ButtonHeight = 30
+    ButtonWidth = 67
    Caption = 'ToolBar1'
    Color = clWhite
    DisabledImages = DataLink_KnitClothStk.ImageList_new32
    EdgeInner = esNone
    EdgeOuter = esNone
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -12
-    Font.Name = #23435#20307
-    Font.Style = []
-    Images = DataLink_KnitClothStk.ImageList_new32
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
-    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
    object TBSave: TToolButton
@ -59,8 +53,8 @@ object frmKnitDRQuickInPut: TfrmKnitDRQuickInPut
  end
  object ScrollBox1: TScrollBox
    Left = 0
-    Top = 38
-    Width = 484
+    Top = 30
+    Width = 503
    Height = 242
    Align = alClient
    BevelInner = bvNone
@ -71,60 +65,36 @@ object frmKnitDRQuickInPut: TfrmKnitDRQuickInPut
    ParentCtl3D = False
    TabOrder = 1
    object Label1: TLabel
-      Left = 244
-      Top = 13
-      Width = 65
-      Height = 12
+      Left = 234
+      Top = 14
+      Width = 80
+      Height = 21
      Caption = #20986#24211#31867#22411#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label12: TLabel
      Left = 33
      Top = 79
-      Width = 67
-      Height = 12
+      Width = 68
+      Height = 21
      Caption = #22791'    '#27880#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label11: TLabel
-      Left = 244
-      Top = 45
-      Width = 65
-      Height = 12
+      Left = 234
+      Top = 44
+      Width = 80
+      Height = 21
      Caption = #25910#36135#21333#20301#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label2: TLabel
-      Left = 35
-      Top = 13
-      Width = 65
-      Height = 12
+      Left = 21
+      Top = 14
+      Width = 80
+      Height = 21
      Caption = #21457#36135#26085#26399#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clBlack
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label27: TLabel
-      Left = 703
-      Top = 12
+      Left = 615
+      Top = 49
      Width = 52
      Height = 15
      Caption = #25968#37327#21333#20301
@ -138,69 +108,29 @@ object frmKnitDRQuickInPut: TfrmKnitDRQuickInPut
    end
    object Label5: TLabel
      Left = 33
-      Top = 43
-      Width = 67
-      Height = 12
+      Top = 47
+      Width = 68
+      Height = 21
      Caption = #21152'    '#37325#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
-    object OutType: TComboBox
-      Tag = 1
-      Left = 306
-      Top = 9
-      Width = 136
-      Height = 20
-      Style = csDropDownList
-      TabOrder = 0
-      Items.Strings = (
-        #38144#21806#20986#24211
-        #21152#24037#20986#24211
-        #30424#20111#20986#24211)
-    end
-    object Note: TEdit
+    object Note: TcxTextEdit
      Tag = 1
      Left = 96
      Top = 79
-      Width = 346
-      Height = 18
-      TabOrder = 2
-    end
-    object ToCoName: TBtnEditC
-      Tag = 1
-      Left = 306
-      Top = 41
-      Width = 136
-      Height = 20
-      TabOrder = 1
-      OnBtnUpClick = ToCoNameBtnUpClick
-      OnBtnDnClick = ToCoNameBtnDnClick
-    end
-    object DlyDate: TDateTimePicker
-      Tag = 1
-      Left = 96
-      Top = 9
-      Width = 132
-      Height = 20
-      Date = 40675.000000000000000000
-      Format = 'yyyy-MM-dd'
-      Time = 0.464761099538009100
-      TabOrder = 3
+      ParentFont = False
+      TabOrder = 0
+      Width = 385
    end
    object QtyUnit: TComboBox
      Tag = 2
-      Left = 761
-      Top = 9
+      Left = 673
+      Top = 41
      Width = 96
-      Height = 20
+      Height = 29
      Style = csDropDownList
      Enabled = False
      ItemIndex = 2
-      TabOrder = 4
+      TabOrder = 1
      Text = 'Kg'
      Visible = False
      Items.Strings = (
@ -208,13 +138,57 @@ object frmKnitDRQuickInPut: TfrmKnitDRQuickInPut
        'Y'
        'Kg')
    end
-    object DRAddWet: TEdit
+    object DRAddWet: TcxTextEdit
      Tag = 1
      Left = 96
      Top = 41
+      ParentFont = False
+      TabOrder = 2
      Width = 132
-      Height = 18
+    end
+    object DlyDate: TcxDateEdit
+      Tag = 1
+      Left = 96
+      Top = 5
+      AutoSize = False
+      EditValue = 45490d
+      ParentFont = False
+      Properties.ShowTime = False
+      TabOrder = 3
+      Height = 33
+      Width = 132
+    end
+    object OutType: TcxComboBox
+      Tag = 1
+      Left = 306
+      Top = 5
+      AutoSize = False
+      ParentFont = False
+      Properties.Items.Strings = (
+        #38144#21806#20986#24211
+        #21152#24037#20986#24211
+        #30424#20111#20986#24211)
+      TabOrder = 4
+      Text = #38144#21806#20986#24211
+      Height = 33
+      Width = 175
+    end
+    object ToCoName: TcxButtonEdit
+      Tag = 1
+      Left = 306
+      Top = 41
+      ParentFont = False
+      Properties.Buttons = <
+        item
+          Default = True
+          Kind = bkEllipsis
+        end>
+      Properties.ReadOnly = True
+      Properties.OnButtonClick = ToCoNameOnButtonClick
+      Style.ButtonStyle = btsDefault
      TabOrder = 5
+      OnDblClick = ToCoNameDblClick
+      Width = 175
    end
  end
  object ADOTemp: TADOQuery
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickInPut.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickInPut.pas
@ -11,7 +11,23 @@ uses
  StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils,
  cxDropDownEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters,
-  dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  dxDateRanges, dxBarBuiltInMenu, U_BaseList, 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, dxCore, cxDateUtils;

 type
  TfrmKnitDRQuickInPut = class(Tform)
@ -23,24 +39,24 @@ type
    ADOCmd: TADOQuery;
    ADOQuery1: TADOQuery;
    Label1: TLabel;
-    OutType: TComboBox;
-    Note: TEdit;
+    Note: TcxTextEdit;
    Label12: TLabel;
    Label11: TLabel;
-    ToCoName: TBtnEditC;
    cxStyleRepository1: TcxStyleRepository;
    dazi1: TcxStyle;
    Label2: TLabel;
-    DlyDate: TDateTimePicker;
    Label27: TLabel;
    QtyUnit: TComboBox;
    Label5: TLabel;
-    DRAddWet: TEdit;
+    DRAddWet: TcxTextEdit;
+    DlyDate: TcxDateEdit;
+    OutType: TcxComboBox;
+    ToCoName: TcxButtonEdit;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
-    procedure ToCoNameBtnUpClick(Sender: TObject);
-    procedure ToCoNameBtnDnClick(Sender: TObject);
+    procedure ToCoNameDblClick(Sender: TObject);
+    procedure ToCoNameOnButtonClick(Sender: TObject; AButtonIndex: Integer);
  private
    fuserName: string;
    procedure InitData();
@ -74,7 +90,7 @@ var
 begin
  if PState = 0 then
  begin
-    DlyDate.DateTime := strtodatetime(Trim(FormatDateTime('yyyy-MM-dd', Now)));
+    DlyDate.Date := strtodatetime(Trim(FormatDateTime('yyyy-MM-dd', Now)));
  end;

  with ADOQuery1 do
@ -87,9 +103,10 @@ begin
    Open;
  end;
  SCSHData(ADOQuery1, ScrollBox1, 1);
-  ToCoName.TxtCode := ADOQuery1.FieldByName('ToCoNo').asstring;
+  ToCoName.Properties.LookupItems.Text := ADOQuery1.FieldByName('ToCoNo').asstring;
 end;

+
 procedure TfrmKnitDRQuickInPut.FormShow(Sender: TObject);
 begin
  InitData();
@ -135,7 +152,7 @@ begin
      end;
      RTSetsavedata(ADOCmd, 'Knit_Cloth_DR_Main', ScrollBox1, 1);
      FieldByName('DRMID').Value := Trim(MaxMid);
-      FieldByName('ToCoNo').Value := Trim(ToCoName.TxtCode);
+      FieldByName('ToCoNo').Value := Trim(ToCoName.Properties.LookupItems.Text);

      FieldByName('Status').Value := '9';
      Post;
@ -152,6 +169,8 @@ begin
  end;
 end;

+
+
 procedure TfrmKnitDRQuickInPut.TBSaveClick(Sender: TObject);
 var
  Freal: Double;
@ -176,9 +195,16 @@ begin
  end;
 end;

-procedure TfrmKnitDRQuickInPut.ToCoNameBtnUpClick(Sender: TObject);
-begin

+procedure TfrmKnitDRQuickInPut.ToCoNameDblClick(Sender: TObject);
+begin
+  ToCoName.Text := '';
+  ToCoName.Properties.LookupItems.Text := '';
+end;
+
+procedure TfrmKnitDRQuickInPut.ToCoNameOnButtonClick(Sender: TObject;
+  AButtonIndex: Integer);
+begin
  try
    frmCompanySel := TfrmCompanySel.Create(Application);
    with frmCompanySel do
@ -186,7 +212,7 @@ begin
      FCoType := '¿Í»§';
      if ShowModal = 1 then
      begin
-        self.ToCoName.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
+        self.ToCoName.Properties.LookupItems.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
        self.ToCoName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString);
      end;
    end;
@ -194,13 +220,8 @@ begin
  finally
    frmCompanySel.Free;
  end;
-
 end;

-procedure TfrmKnitDRQuickInPut.ToCoNameBtnDnClick(Sender: TObject);
-begin
-  ToCoName.Text := '';
-end;

 end.

--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickInPut.vlb
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickInPut.vlb
@ -0,0 +1,75 @@
+[ToCoName]
+Coordinates=393,212,80,36
+
+[Label27]
+Coordinates=339,10,60,58
+
+[ADOQuery1]
+Coordinates=206,144,84,58
+
+[OutType]
+Coordinates=319,212,64,36
+ExplicitSubNodes=
+Visible=True
+
+[ADOCmd]
+Coordinates=409,10,69,58
+
+[DataLink_KnitClothStk.AdoDataLink]
+Coordinates=488,10,221,58
+
+[Label2]
+Coordinates=121,10,53,58
+
+[QtyUnit]
+Coordinates=10,10,101,124
+
+[dazi1]
+Coordinates=288,309,45,36
+
+[Label5]
+Coordinates=143,144,53,58
+
+[ToolBar1]
+Coordinates=242,212,67,36
+Visible=True
+
+[DRAddWet]
+Coordinates=154,212,78,58
+ExplicitSubNodes=Text
+
+[Label12]
+Coordinates=269,10,60,58
+
+[cxStyleRepository1]
+Coordinates=528,111,125,36
+
+[ADOTemp]
+Coordinates=184,10,75,58
+
+[Label11]
+Coordinates=10,144,60,58
+
+[TBClose]
+Coordinates=80,212,64,36
+
+[TBSave]
+Coordinates=10,212,60,36
+
+[DlyDate]
+Coordinates=438,144,60,58
+ExplicitSubNodes=Date
+
+[ScrollBox1]
+Coordinates=352,144,76,36
+
+[Note]
+Coordinates=300,144,42,58
+ExplicitSubNodes=Text
+
+[Label1]
+Coordinates=80,144,53,58
+
+[]
+Coordinates=130,87,91,36
+
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickSel.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickSel.dfm
@ -4,31 +4,31 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
  BorderStyle = bsSingle
  Caption = #21457#36135#30003#35831
  ClientHeight = 487
-  ClientWidth = 1418
+  ClientWidth = 932
  Color = clWhite
  Position = poScreenCenter
-  ExplicitWidth = 1424
+  ExplicitWidth = 938
  ExplicitHeight = 516
  PixelsPerInch = 96
-  TextHeight = 13
+  TextHeight = 21
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
-    Width = 1418
-    Height = 38
+    Width = 932
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 83
    Caption = 'ToolBar1'
    Color = clSkyBlue
-    DisabledImages = DataLink_KnitClothStk.ImageList_new32
+    DisabledImages = DataLink_KnitClothStk.cxImageList_bar
    Font.Charset = GB2312_CHARSET
    Font.Color = clWindowText
    Font.Height = -12
    Font.Name = #23435#20307
    Font.Style = []
-    Images = DataLink_KnitClothStk.ImageList_new32
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
    ParentFont = False
@ -43,7 +43,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      OnClick = TBRafreshClick
    end
    object TBFind: TToolButton
-      Left = 71
+      Left = 63
      Top = 0
      AutoSize = True
      Caption = #36807#28388
@ -51,7 +51,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      OnClick = TBFindClick
    end
    object ToolButton1: TToolButton
-      Left = 142
+      Left = 126
      Top = 0
      AutoSize = True
      Caption = #30830#35748
@ -59,7 +59,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      OnClick = ToolButton1Click
    end
    object ToolButton2: TToolButton
-      Left = 213
+      Left = 189
      Top = 0
      AutoSize = True
      Caption = #20462#25913
@ -67,7 +67,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      OnClick = ToolButton2Click
    end
    object ToolButton6: TToolButton
-      Left = 284
+      Left = 252
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -75,7 +75,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      OnClick = ToolButton6Click
    end
    object TBClose: TToolButton
-      Left = 379
+      Left = 339
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -85,14 +85,15 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
  end
  object cxGrid1: TcxGrid [1]
    Left = 0
-    Top = 102
-    Width = 1418
-    Height = 385
+    Top = 138
+    Width = 932
+    Height = 349
    Align = alClient
    TabOrder = 3
    object Tv1: TcxGridDBTableView
      OnDblClick = Tv1DblClick
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DataSource1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <
@ -147,14 +148,11 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      OptionsView.GroupByBox = False
      OptionsView.GroupFooters = gfAlwaysVisible
      OptionsView.IndicatorWidth = 30
-      Styles.IncSearch = DataLink_KnitClothStk.SHuangSe
      Styles.Footer = DataLink_KnitClothStk.Default
-      Styles.Header = DataLink_KnitClothStk.Default
-      Styles.Inactive = DataLink_KnitClothStk.SHuangSe
-      Styles.Selection = DataLink_KnitClothStk.SHuangSe
      object v1Column8: TcxGridDBColumn
        Caption = #30003#35831#21333#21495
        DataBinding.FieldName = 'DRMID'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 93
@ -162,6 +160,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      object v1OrdDate: TcxGridDBColumn
        Caption = #30331#35760#26085#26399
        DataBinding.FieldName = 'Filltime'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxDateEditProperties'
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
@ -172,6 +171,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      object v1Column27: TcxGridDBColumn
        Caption = #21457#36135#26085#26399
        DataBinding.FieldName = 'fhDate'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 154
@ -179,6 +179,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      object v1Column10: TcxGridDBColumn
        Caption = #25910#36135#21333#20301
        DataBinding.FieldName = 'ToCoName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 124
@ -186,6 +187,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      object v1Column1: TcxGridDBColumn
        Caption = #30003#35831#20154
        DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 77
@ -193,6 +195,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      object v1Column7: TcxGridDBColumn
        Caption = #22791#27880
        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v1Column7PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -202,6 +205,7 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      object Tv1Column1: TcxGridDBColumn
        Caption = #20986#24211#31867#22411
        DataBinding.FieldName = 'OutType'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 96
@ -213,9 +217,9 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
  end
  object Panel1: TPanel [2]
    Left = 0
-    Top = 38
-    Width = 1418
-    Height = 43
+    Top = 30
+    Width = 932
+    Height = 80
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -223,17 +227,11 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
    ParentBackground = False
    TabOrder = 1
    object Label4: TLabel
-      Left = 464
-      Top = 15
-      Width = 48
-      Height = 12
+      Left = 196
+      Top = 45
+      Width = 64
+      Height = 21
      Caption = #25910#36135#21333#20301
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
    end
    object Label8: TLabel
      Left = 430
@ -275,117 +273,135 @@ inherited frmKnitDRQuickSel: TfrmKnitDRQuickSel
      ParentFont = False
    end
    object Label2: TLabel
-      Left = 160
-      Top = 15
-      Width = 4
-      Height = 13
+      Left = 154
+      Top = 98
+      Width = 7
+      Height = 21
      Caption = '-'
    end
    object Label1: TLabel
-      Left = 286
-      Top = 15
-      Width = 48
-      Height = 12
+      Left = 25
+      Top = 45
+      Width = 64
+      Height = 21
      Caption = #30003#35831#21333#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
    end
    object BegDate: TDateTimePicker
-      Left = 76
-      Top = 11
+      Left = 175
+      Top = 134
      Width = 85
-      Height = 20
+      Height = 29
      Date = 40675.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.464742650459811600
      TabOrder = 0
    end
    object EndDate: TDateTimePicker
-      Left = 168
-      Top = 11
+      Left = 166
+      Top = 99
      Width = 86
-      Height = 20
+      Height = 29
      Date = 40675.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.464761099538009100
      TabOrder = 1
    end
-    object ToCoName: TEdit
+    object ToCoName: TcxTextEdit
      Tag = 2
-      Left = 518
-      Top = 11
-      Width = 115
-      Height = 21
+      Left = 264
+      Top = 41
+      ParentFont = False
      TabOrder = 2
-      OnChange = ToCoNameChange
+      Width = 115
    end
-    object MPRTCodeName: TEdit
+    object MPRTCodeName: TcxTextEdit
      Tag = 2
      Left = 483
      Top = 95
-      Width = 76
-      Height = 21
+      ParentFont = False
      TabOrder = 4
-      OnChange = ToCoNameChange
+      Width = 76
    end
-    object MPRTKZ: TEdit
+    object MPRTKZ: TcxTextEdit
      Tag = 2
      Left = 332
      Top = 95
-      Width = 56
-      Height = 21
+      ParentFont = False
      TabOrder = 3
-      OnChange = ToCoNameChange
+      Width = 56
    end
-    object MPRTMF: TEdit
+    object MPRTMF: TcxTextEdit
      Tag = 2
      Left = 332
      Top = 119
-      Width = 56
-      Height = 21
+      ParentFont = False
      TabOrder = 5
-      OnChange = ToCoNameChange
+      Width = 56
    end
    object CheckBox1: TCheckBox
-      Left = 9
-      Top = 13
-      Width = 65
+      Left = 60
+      Top = 101
+      Width = 88
      Height = 17
      Caption = #30331#35760#26085#26399
      Checked = True
      State = cbChecked
      TabOrder = 6
    end
-    object DRMID: TEdit
+    object DRMID: TcxTextEdit
      Tag = 2
-      Left = 341
-      Top = 11
-      Width = 99
-      Height = 21
+      Left = 93
+      Top = 41
+      ParentFont = False
      TabOrder = 7
-      OnChange = ToCoNameChange
+      Width = 99
+    end
+    inline frmFrameDateSel: TfrmFrameDateSel
+      Left = 2
+      Top = 2
+      Width = 928
+      Height = 37
+      Align = alTop
+      Color = clWhite
+      ParentBackground = False
+      ParentColor = False
+      TabOrder = 8
+      ExplicitLeft = 2
+      ExplicitTop = 2
+      ExplicitWidth = 928
+      inherited BegDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited EndDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited cbbType: TcxComboBox
+        ExplicitHeight = 33
+      end
    end
  end
  object cxTabControl1: TcxTabControl [3]
    Left = 0
-    Top = 81
-    Width = 1418
-    Height = 21
+    Top = 110
+    Width = 932
+    Height = 28
    Align = alTop
+    Color = clWhite
    Enabled = False
+    ParentBackground = False
+    ParentColor = False
    TabOrder = 2
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
-    Properties.TabIndex = 1
+    Properties.TabIndex = 3
    Properties.Tabs.Strings = (
      #26410#23457#26680
      #24050#23457#26680
      #24050#23436#25104
      #20840#37096)
+    LookAndFeel.NativeStyle = False
+    LookAndFeel.ScrollbarMode = sbmDefault
+    LookAndFeel.SkinName = 'WXI'
    OnChange = cxTabControl1Change
    ClientRectRight = 0
    ClientRectTop = 0
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickSel.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRQuickSel.pas
@ -12,7 +12,24 @@ uses
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
  cxDropDownEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
  dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, U_BaseHelp,
-  dxDateRanges, U_BaseList, System.ImageList, Vcl.ImgList;
+  dxDateRanges, U_BaseList, System.ImageList, Vcl.ImgList, 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,
+  cxContainer, FrameDateSel;

 type
  TfrmKnitDRQuickSel = class(TfrmBaseHelp)
@ -37,10 +54,10 @@ type
    Label13: TLabel;
    BegDate: TDateTimePicker;
    EndDate: TDateTimePicker;
-    ToCoName: TEdit;
-    MPRTCodeName: TEdit;
-    MPRTKZ: TEdit;
-    MPRTMF: TEdit;
+    ToCoName: TcxTextEdit;
+    MPRTCodeName: TcxTextEdit;
+    MPRTKZ: TcxTextEdit;
+    MPRTMF: TcxTextEdit;
    cxTabControl1: TcxTabControl;
    v1Column8: TcxGridDBColumn;
    Label2: TLabel;
@ -54,6 +71,7 @@ type
    ToolButton1: TToolButton;
    ToolButton2: TToolButton;
    Tv1Column1: TcxGridDBColumn;
+    frmFrameDateSel: TfrmFrameDateSel;
    //RMllPDFExport1: TRMllPDFExport;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
@ -121,8 +139,8 @@ begin
      sql.Add(' from Knit_Cloth_DR_Main A where 1=1');
      if CheckBox1.Checked then
      begin
-        sql.Add(' and Filltime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
-        sql.Add(' and Filltime<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
+        sql.Add(' and Filltime>=''' + FormatDateTime('yyyy-MM-dd', frmFrameDateSel.begdate.Date) + ''' ');
+        sql.Add(' and Filltime<''' + FormatDateTime('yyyy-MM-dd', frmFrameDateSel.Enddate.Date + 1) + ''' ');
      end;
      case cxTabControl1.TabIndex of
        0:
@ -151,6 +169,7 @@ begin
  end;
 end;

+
 procedure TfrmKnitDRQuickSel.TBFindClick(Sender: TObject);
 begin
  if ADOQueryMain.Active = False then
@ -172,8 +191,8 @@ begin

  ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, '·¢»õ¹ÜÀí');

-  EndDate.DateTime := SGetServerDate(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 3;
+  frmFrameDateSel.EndDate.Date := SGetServerDate(ADOQueryTemp);
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel.EndDate.Date - 3;

  InitGrid();
 end;
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRSel.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRSel.dfm
@ -7,32 +7,25 @@ inherited frmKnitDRSel: TfrmKnitDRSel
  ClientWidth = 1418
  Color = clWhite
  Position = poScreenCenter
-  ExplicitTop = -86
  ExplicitWidth = 1424
  ExplicitHeight = 749
  PixelsPerInch = 96
-  TextHeight = 13
+  TextHeight = 21
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1418
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 99
    Caption = 'ToolBar1'
    Color = clSkyBlue
-    DisabledImages = DataLink_KnitClothStk.ImageList_new32
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -12
-    Font.Name = #23435#20307
-    Font.Style = []
-    Images = DataLink_KnitClothStk.ImageList_new32
+    DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
-    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
    object TBRafresh: TToolButton
@ -68,7 +61,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      OnClick = ToolButton6Click
    end
    object TBClose: TToolButton
-      Left = 308
+      Left = 316
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -78,14 +71,14 @@ inherited frmKnitDRSel: TfrmKnitDRSel
  end
  object cxGrid1: TcxGrid [1]
    Left = 0
-    Top = 102
+    Top = 136
    Width = 1418
-    Height = 388
+    Height = 354
    Align = alClient
    TabOrder = 3
-    ExplicitTop = 104
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      OnFocusedRecordChanged = Tv1FocusedRecordChanged
      DataController.DataSource = DataSource1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -141,14 +134,10 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      OptionsView.GroupByBox = False
      OptionsView.GroupFooters = gfAlwaysVisible
      OptionsView.IndicatorWidth = 30
-      Styles.IncSearch = DataLink_KnitClothStk.SHuangSe
-      Styles.Footer = DataLink_KnitClothStk.Default
-      Styles.Header = DataLink_KnitClothStk.Default
-      Styles.Inactive = DataLink_KnitClothStk.SHuangSe
-      Styles.Selection = DataLink_KnitClothStk.SHuangSe
      object v1Column8: TcxGridDBColumn
        Caption = #30003#35831#21333#21495
        DataBinding.FieldName = 'DRMID'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 93
@ -156,6 +145,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object v1OrdDate: TcxGridDBColumn
        Caption = #30331#35760#26085#26399
        DataBinding.FieldName = 'Filltime'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxDateEditProperties'
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
@ -166,6 +156,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object v1Column27: TcxGridDBColumn
        Caption = #21457#36135#26085#26399
        DataBinding.FieldName = 'fhDate'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 69
@ -173,6 +164,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object v1Column10: TcxGridDBColumn
        Caption = #25910#36135#21333#20301
        DataBinding.FieldName = 'ToCoName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 124
@ -180,6 +172,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object v1Column1: TcxGridDBColumn
        Caption = #30003#35831#20154
        DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -187,6 +180,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object v1Column13: TcxGridDBColumn
        Caption = #23457#26680#20154
        DataBinding.FieldName = 'Chker'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 65
@ -194,6 +188,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object v1Column17: TcxGridDBColumn
        Caption = #23457#26680#26085#26399
        DataBinding.FieldName = 'ChkTime'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -201,6 +196,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object v1Column7: TcxGridDBColumn
        Caption = #22791#27880
        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        Properties.OnEditValueChanged = v1Column7PropertiesEditValueChanged
        HeaderAlignmentHorz = taCenter
@ -214,9 +210,9 @@ inherited frmKnitDRSel: TfrmKnitDRSel
  end
  object Panel1: TPanel [2]
    Left = 0
-    Top = 38
+    Top = 30
    Width = 1418
-    Height = 43
+    Height = 78
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -224,21 +220,15 @@ inherited frmKnitDRSel: TfrmKnitDRSel
    ParentBackground = False
    TabOrder = 1
    object Label4: TLabel
-      Left = 464
-      Top = 15
-      Width = 48
-      Height = 12
+      Left = 196
+      Top = 45
+      Width = 64
+      Height = 21
      Caption = #25910#36135#21333#20301
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
    end
    object Label8: TLabel
      Left = 430
-      Top = 99
+      Top = 115
      Width = 52
      Height = 12
      Caption = #20135#21697#21517#31216
@ -251,7 +241,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
    end
    object Label12: TLabel
      Left = 303
-      Top = 99
+      Top = 115
      Width = 26
      Height = 12
      Caption = #20811#37325
@ -264,7 +254,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
    end
    object Label13: TLabel
      Left = 303
-      Top = 123
+      Top = 139
      Width = 26
      Height = 12
      Caption = #38376#24133
@ -276,28 +266,22 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      ParentFont = False
    end
    object Label2: TLabel
-      Left = 160
-      Top = 15
-      Width = 4
-      Height = 13
+      Left = 184
+      Top = 121
+      Width = 7
+      Height = 21
      Caption = '-'
    end
    object Label1: TLabel
-      Left = 286
-      Top = 15
-      Width = 48
-      Height = 12
+      Left = 25
+      Top = 45
+      Width = 64
+      Height = 21
      Caption = #30003#35831#21333#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
    end
    object BegDate: TDateTimePicker
-      Left = 76
-      Top = 11
+      Left = 100
+      Top = 117
      Width = 85
      Height = 20
      Date = 40675.000000000000000000
@ -306,8 +290,8 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      TabOrder = 0
    end
    object EndDate: TDateTimePicker
-      Left = 168
-      Top = 11
+      Left = 192
+      Top = 117
      Width = 86
      Height = 20
      Date = 40675.000000000000000000
@ -315,45 +299,41 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      Time = 0.464761099538009100
      TabOrder = 1
    end
-    object ToCoName: TEdit
+    object ToCoName: TcxTextEdit
      Tag = 2
-      Left = 518
-      Top = 11
-      Width = 115
-      Height = 21
+      Left = 264
+      Top = 39
+      ParentFont = False
      TabOrder = 2
-      OnChange = ToCoNameChange
+      Width = 115
    end
-    object MPRTCodeName: TEdit
+    object MPRTCodeName: TcxTextEdit
      Tag = 2
      Left = 483
-      Top = 95
-      Width = 76
-      Height = 21
+      Top = 111
+      ParentFont = False
      TabOrder = 4
-      OnChange = ToCoNameChange
+      Width = 76
    end
-    object MPRTKZ: TEdit
+    object MPRTKZ: TcxTextEdit
      Tag = 2
      Left = 332
-      Top = 95
-      Width = 56
-      Height = 21
+      Top = 111
+      ParentFont = False
      TabOrder = 3
-      OnChange = ToCoNameChange
+      Width = 56
    end
-    object MPRTMF: TEdit
+    object MPRTMF: TcxTextEdit
      Tag = 2
      Left = 332
-      Top = 119
-      Width = 56
-      Height = 21
+      Top = 135
+      ParentFont = False
      TabOrder = 5
-      OnChange = ToCoNameChange
+      Width = 56
    end
    object CheckBox1: TCheckBox
-      Left = 9
-      Top = 13
+      Left = 33
+      Top = 119
      Width = 65
      Height = 17
      Caption = #30331#35760#26085#26399
@ -361,27 +341,48 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      State = cbChecked
      TabOrder = 6
    end
-    object DRMID: TEdit
+    object DRMID: TcxTextEdit
      Tag = 2
-      Left = 341
-      Top = 11
-      Width = 99
-      Height = 21
+      Left = 93
+      Top = 39
+      ParentFont = False
      TabOrder = 7
-      OnChange = ToCoNameChange
+      Width = 99
+    end
+    inline frmFrameDateSel: TfrmFrameDateSel
+      Left = 2
+      Top = 2
+      Width = 1414
+      Height = 37
+      Align = alTop
+      Color = clWhite
+      ParentBackground = False
+      ParentColor = False
+      TabOrder = 8
+      ExplicitLeft = 2
+      ExplicitTop = 2
+      ExplicitWidth = 1414
+      inherited BegDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited EndDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited cbbType: TcxComboBox
+        ExplicitHeight = 33
+      end
    end
  end
  object cxTabControl1: TcxTabControl [3]
    Left = 0
-    Top = 81
+    Top = 108
    Width = 1418
-    Height = 21
+    Height = 28
    Align = alTop
-    Enabled = False
    TabOrder = 2
    Properties.CustomButtons.Buttons = <>
    Properties.Style = 9
-    Properties.TabIndex = 1
+    Properties.TabIndex = 2
    Properties.Tabs.Strings = (
      #26410#23457#26680
      #24050#23457#26680
@ -408,6 +409,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
    TabOrder = 5
    object TV2: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_2
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <
@ -440,14 +442,10 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      OptionsCustomize.ColumnFiltering = False
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
-      Styles.IncSearch = DataLink_KnitClothStk.SHuangSe
-      Styles.Footer = DataLink_KnitClothStk.Default
-      Styles.Header = DataLink_KnitClothStk.Default
-      Styles.Inactive = DataLink_KnitClothStk.SHuangSe
-      Styles.Selection = DataLink_KnitClothStk.SHuangSe
      object cxGridDBColumn1: TcxGridDBColumn
        Caption = #21512#21516#21495
        DataBinding.FieldName = 'SCConNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -455,6 +453,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object cxGridDBColumn2: TcxGridDBColumn
        Caption = #23458#25143#35746#21333#21495
        DataBinding.FieldName = 'KHConno'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 94
@ -462,6 +461,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object cxGridDBColumn3: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 88
@ -469,6 +469,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object v1Column6: TcxGridDBColumn
        Caption = #20135#21697#21517#31216
        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 71
@ -476,6 +477,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object cxGridDBColumn4: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 73
@ -483,6 +485,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object cxGridDBColumn5: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 60
@ -490,6 +493,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object cxGridDBColumn6: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 71
@ -497,6 +501,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object cxGridDBColumn7: TcxGridDBColumn
        Caption = #30003#35831#21305#25968
        DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 81
@ -504,6 +509,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object cv1Column3: TcxGridDBColumn
        Caption = #30003#35831#25968#37327
        DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -512,11 +518,13 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object TV2Column1: TcxGridDBColumn
        Caption = #25968#37327#21333#20301
        DataBinding.FieldName = 'QtyUnit'
+        DataBinding.IsNullValueType = True
        Options.Editing = False
      end
      object TV2Column2: TcxGridDBColumn
        Caption = #21457#36135#21305#25968
        DataBinding.FieldName = 'DlyPiece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 70
@ -524,6 +532,7 @@ inherited frmKnitDRSel: TfrmKnitDRSel
      object TV2Column3: TcxGridDBColumn
        Caption = #21457#36135#25968#37327
        DataBinding.FieldName = 'DlyQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRSel.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRSel.pas
@ -12,7 +12,24 @@ uses
  RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
  cxDropDownEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
  dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, U_BaseHelp,
-  dxDateRanges, U_BaseList, System.ImageList, Vcl.ImgList;
+  dxDateRanges, U_BaseList, System.ImageList, Vcl.ImgList, 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,
+  cxContainer, FrameDateSel;

 type
  TfrmKnitDRSel = class(TfrmBaseHelp)
@ -37,10 +54,10 @@ type
    Label13: TLabel;
    BegDate: TDateTimePicker;
    EndDate: TDateTimePicker;
-    ToCoName: TEdit;
-    MPRTCodeName: TEdit;
-    MPRTKZ: TEdit;
-    MPRTMF: TEdit;
+    ToCoName: TcxTextEdit;
+    MPRTCodeName: TcxTextEdit;
+    MPRTKZ: TcxTextEdit;
+    MPRTMF: TcxTextEdit;
    cxTabControl1: TcxTabControl;
    cxSplitter1: TcxSplitter;
    DS_2: TDataSource;
@ -73,6 +90,7 @@ type
    TV2Column2: TcxGridDBColumn;
    TV2Column3: TcxGridDBColumn;
    ToolButton1: TToolButton;
+    frmFrameDateSel: TfrmFrameDateSel;
    //RMllPDFExport1: TRMllPDFExport;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
@ -140,8 +158,8 @@ begin
      sql.Add(' from Knit_Cloth_DR_Main A where 1=1');
      if CheckBox1.Checked then
      begin
-        sql.Add(' and Filltime>=''' + FormatDateTime('yyyy-MM-dd', begdate.DateTime) + ''' ');
-        sql.Add(' and Filltime<''' + FormatDateTime('yyyy-MM-dd', Enddate.DateTime + 1) + ''' ');
+        sql.Add(' and Filltime>=''' + FormatDateTime('yyyy-MM-dd', frmFrameDateSel.begdate.Date) + ''' ');
+        sql.Add(' and Filltime<''' + FormatDateTime('yyyy-MM-dd', frmFrameDateSel.Enddate.Date + 1) + ''' ');
      end;
      case cxTabControl1.TabIndex of
        0:
@ -193,8 +211,8 @@ begin
  ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, '·¢»õ¹ÜÀí');
  ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, '·¢»õ¹ÜÀí');

-  EndDate.DateTime := SGetServerDate(ADOQueryTemp);
-  BegDate.DateTime := EndDate.DateTime - 60;
+  frmFrameDateSel.EndDate.Date := SGetServerDate(ADOQueryTemp);
+  frmFrameDateSel.BegDate.Date := EndDate.DateTime - 60;

  InitGrid();
 end;
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRtInPut.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRtInPut.dfm
@ -7,37 +7,31 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
  Color = clWhite
  Font.Charset = GB2312_CHARSET
  Font.Color = clWindowText
-  Font.Height = -12
-  Font.Name = #23435#20307
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
  Font.Style = []
  OldCreateOrder = True
  Position = poScreenCenter
  OnShow = FormShow
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 21
  object ToolBar1: TToolBar
    Tag = 1
    Left = 0
    Top = 0
    Width = 1252
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 99
    Caption = 'ToolBar1'
    Color = clWhite
-    DisabledImages = DataLink_KnitClothStk.ImageList_new32
+    DisabledImages = DataLink_KnitClothStk.cxImageList_bar
    EdgeInner = esNone
    EdgeOuter = esNone
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -12
-    Font.Name = #23435#20307
-    Font.Style = []
-    Images = DataLink_KnitClothStk.ImageList_new32
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
-    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
    object TBSave: TToolButton
@ -57,7 +51,7 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
      OnClick = ToolButton4Click
    end
    object TBClose: TToolButton
-      Left = 166
+      Left = 174
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -67,9 +61,9 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
  end
  object ScrollBox1: TScrollBox
    Left = 0
-    Top = 38
+    Top = 30
    Width = 1252
-    Height = 75
+    Height = 87
    Align = alTop
    BevelInner = bvNone
    BevelOuter = bvNone
@ -78,174 +72,140 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
    ParentColor = False
    ParentCtl3D = False
    TabOrder = 1
-    ExplicitWidth = 304
    object Label1: TLabel
-      Left = 244
-      Top = 13
-      Width = 65
-      Height = 12
+      Left = 251
+      Top = 15
+      Width = 80
+      Height = 21
      Caption = #20986#24211#31867#22411#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label12: TLabel
-      Left = 31
-      Top = 42
-      Width = 67
-      Height = 12
+      Left = 43
+      Top = 54
+      Width = 68
+      Height = 21
      Caption = #22791'    '#27880#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label11: TLabel
-      Left = 465
-      Top = 13
-      Width = 65
-      Height = 12
+      Left = 475
+      Top = 15
+      Width = 80
+      Height = 21
      Caption = #25910#36135#21333#20301#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label2: TLabel
      Left = 33
-      Top = 13
-      Width = 65
-      Height = 12
+      Top = 15
+      Width = 80
+      Height = 21
      Caption = #21457#36135#26085#26399#65306
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clBlack
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label27: TLabel
-      Left = 703
-      Top = 12
-      Width = 52
-      Height = 15
+      Left = 701
+      Top = 15
+      Width = 64
+      Height = 21
      Caption = #25968#37327#21333#20301
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = 'Times New Roman'
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label5: TLabel
-      Left = 898
-      Top = 13
-      Width = 54
-      Height = 12
+      Left = 873
+      Top = 15
+      Width = 52
+      Height = 21
      Caption = #21152'    '#37325
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
-    object OutType: TComboBox
+    object Note: TcxTextEdit
      Tag = 1
-      Left = 306
-      Top = 9
-      Width = 136
-      Height = 20
-      Style = csDropDownList
+      Left = 115
+      Top = 48
+      ParentFont = False
      TabOrder = 0
-      Items.Strings = (
+      Width = 914
+    end
+    object DRAddWet: TcxTextEdit
+      Tag = 1
+      Left = 929
+      Top = 9
+      ParentFont = False
+      TabOrder = 1
+      Width = 100
+    end
+    object DlyDate: TcxDateEdit
+      Tag = 1
+      Left = 115
+      Top = 9
+      AutoSize = False
+      EditValue = 45490d
+      ParentFont = False
+      Properties.ShowTime = False
+      TabOrder = 2
+      Height = 33
+      Width = 132
+    end
+    object OutType: TcxComboBox
+      Tag = 1
+      Left = 333
+      Top = 9
+      AutoSize = False
+      ParentFont = False
+      Properties.Items.Strings = (
        #38144#21806#20986#24211
        #21152#24037#20986#24211)
-    end
-    object Note: TEdit
-      Tag = 1
-      Left = 96
-      Top = 39
-      Width = 962
-      Height = 18
-      TabOrder = 2
-    end
-    object ToCoName: TBtnEditC
-      Tag = 1
-      Left = 528
-      Top = 9
-      Width = 138
-      Height = 20
-      TabOrder = 1
-      OnBtnUpClick = ToCoNameBtnUpClick
-      OnBtnDnClick = ToCoNameBtnDnClick
-    end
-    object DlyDate: TDateTimePicker
-      Tag = 1
-      Left = 96
-      Top = 9
-      Width = 132
-      Height = 20
-      Date = 40675.000000000000000000
-      Format = 'yyyy-MM-dd'
-      Time = 0.464761099538009100
      TabOrder = 3
+      Text = #38144#21806#20986#24211
+      Height = 33
+      Width = 136
    end
-    object QtyUnit: TComboBox
+    object QtyUnit: TcxComboBox
      Tag = 2
-      Left = 761
+      Left = 771
      Top = 9
-      Width = 96
-      Height = 20
-      Style = csDropDownList
-      Enabled = False
-      ItemIndex = 2
-      TabOrder = 4
-      Text = 'Kg'
-      Items.Strings = (
+      AutoSize = False
+      ParentFont = False
+      Properties.Items.Strings = (
        'M'
        'Y'
        'Kg')
+      TabOrder = 4
+      Text = 'M'
+      Height = 33
+      Width = 96
    end
-    object DRAddWet: TEdit
+    object ToCoName: TcxButtonEdit
      Tag = 1
-      Left = 956
+      Left = 561
      Top = 9
-      Width = 100
-      Height = 18
+      ParentFont = False
+      Properties.Buttons = <
+        item
+          Default = True
+          Kind = bkEllipsis
+        end>
+      Properties.ReadOnly = True
+      Properties.OnButtonClick = ToCoNameButtonClick
+      Style.ButtonStyle = btsDefault
      TabOrder = 5
+      OnDblClick = ToCoNameDblClick
+      Width = 134
    end
  end
  object ToolBar2: TToolBar
    Tag = 1
    Left = 0
-    Top = 113
+    Top = 117
    Width = 1252
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 75
+    ButtonHeight = 30
+    ButtonWidth = 67
    Caption = 'ToolBar1'
    Color = clBtnFace
-    DisabledImages = DataLink_KnitClothStk.ImageList_new32
+    DisabledImages = DataLink_KnitClothStk.cxImageList_bar
    EdgeInner = esNone
    EdgeOuter = esNone
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -12
-    Font.Name = #23435#20307
-    Font.Style = []
-    Images = DataLink_KnitClothStk.ImageList_new32
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
-    ParentFont = False
    ShowCaptions = True
    TabOrder = 2
    object ToolButton3: TToolButton
@ -276,13 +236,14 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
  end
  object cxGrid1: TcxGrid
    Left = 0
-    Top = 151
+    Top = 147
    Width = 1252
-    Height = 292
+    Height = 296
    Align = alClient
    TabOrder = 3
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DataSource1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <
@ -317,6 +278,7 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
      object v1Column2: TcxGridDBColumn
        Caption = #21512#21516#21495
        DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -324,6 +286,7 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
      object Tv1Column8: TcxGridDBColumn
        Caption = #35745#21010#21333#21495
        DataBinding.FieldName = 'orderno'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 86
@ -331,24 +294,31 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
      object Tv1Column3: TcxGridDBColumn
        Caption = #23458#25143#35746#21333#21495
        DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 94
      end
      object v1Column5: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 88
      end
      object v1Column6: TcxGridDBColumn
        Caption = #20135#21697#21517#31216
        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 71
      end
      object v1Column1: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 73
@ -356,62 +326,81 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
      object v1Column7: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 60
      end
      object Tv1Column6: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 71
      end
      object Tv1Column1: TcxGridDBColumn
        Caption = #38376#24133
        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 72
      end
      object Tv1Column4: TcxGridDBColumn
        Caption = #20811#37325
        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 74
      end
      object Tv1Column5: TcxGridDBColumn
        Caption = #25209#21495
        DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 74
      end
      object Tv1Column7: TcxGridDBColumn
        Caption = #32455#26426#21495
        DataBinding.FieldName = 'Loom'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 72
      end
      object Tv1Column2: TcxGridDBColumn
        Caption = #30003#35831#21305#25968
        DataBinding.FieldName = 'Piece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 81
      end
      object cv1Column3: TcxGridDBColumn
        Caption = #30003#35831#25968#37327
        DataBinding.FieldName = 'Qty'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxTextEditProperties'
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 90
      end
      object Tv1Column9: TcxGridDBColumn
        Caption = #21333#20215
        DataBinding.FieldName = 'Price'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 60
      end
      object Tv1Column10: TcxGridDBColumn
        Tag = 9
        Caption = #35746#21333#25968#37327
        DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -420,6 +409,7 @@ object frmKnitDRtInPut: TfrmKnitDRtInPut
        Tag = 9
        Caption = #35746#21333#21305#25968
        DataBinding.FieldName = 'OrdPiece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRtInPut.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitDRtInPut.pas
@ -11,7 +11,23 @@ uses
  StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils,
  cxDropDownEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
  cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters,
-  dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  dxDateRanges, dxBarBuiltInMenu, U_BaseList, 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, dxCore, cxDateUtils;

 type
  TfrmKnitDRtInPut = class(Tform)
@ -32,11 +48,9 @@ type
    ADOQuery1: TADOQuery;
    cxGridPopupMenu2: TcxGridPopupMenu;
    Label1: TLabel;
-    OutType: TComboBox;
-    Note: TEdit;
+    Note: TcxTextEdit;
    Label12: TLabel;
    Label11: TLabel;
-    ToCoName: TBtnEditC;
    v1Column1: TcxGridDBColumn;
    cv1Column3: TcxGridDBColumn;
    cxStyleRepository1: TcxStyleRepository;
@ -46,14 +60,12 @@ type
    v1Column6: TcxGridDBColumn;
    v1Column7: TcxGridDBColumn;
    Label2: TLabel;
-    DlyDate: TDateTimePicker;
    Tv1Column2: TcxGridDBColumn;
    ToolButton3: TToolButton;
    Tv1Column3: TcxGridDBColumn;
    Tv1Column6: TcxGridDBColumn;
    ToolButton4: TToolButton;
    Label27: TLabel;
-    QtyUnit: TComboBox;
    Tv1Column1: TcxGridDBColumn;
    Tv1Column4: TcxGridDBColumn;
    Tv1Column5: TcxGridDBColumn;
@ -61,19 +73,23 @@ type
    Tv1Column8: TcxGridDBColumn;
    Tv1Column9: TcxGridDBColumn;
    Label5: TLabel;
-    DRAddWet: TEdit;
+    DRAddWet: TcxTextEdit;
    Tv1Column10: TcxGridDBColumn;
    Tv1Column11: TcxGridDBColumn;
+    DlyDate: TcxDateEdit;
+    OutType: TcxComboBox;
+    QtyUnit: TcxComboBox;
+    ToCoName: TcxButtonEdit;
    procedure TBCloseClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure TBSaveClick(Sender: TObject);
    procedure ToolButton1Click(Sender: TObject);
    procedure ToolButton2Click(Sender: TObject);
-    procedure ToCoNameBtnUpClick(Sender: TObject);
-    procedure ToCoNameBtnDnClick(Sender: TObject);
    procedure JSQtyUnitChange(Sender: TObject);
    procedure ToolButton3Click(Sender: TObject);
    procedure ToolButton4Click(Sender: TObject);
+    procedure ToCoNameDblClick(Sender: TObject);
+    procedure ToCoNameButtonClick(Sender: TObject; AButtonIndex: Integer);
  private
    fuserName: string;
    procedure InitData();
@ -109,7 +125,7 @@ var
 begin
  if PState = 0 then
  begin
-    DlyDate.DateTime := strtodatetime(Trim(FormatDateTime('yyyy-MM-dd', Now)));
+    DlyDate.Date := strtodatetime(Trim(FormatDateTime('yyyy-MM-dd', Now)));

  end;
  with ADOQuery1 do
@ -142,7 +158,7 @@ begin
    Open;
  end;
  SCSHData(ADOQuery1, ScrollBox1, 1);
-  ToCoName.TxtCode := ADOQuery1.FieldByName('ToCoNo').asstring;
+  ToCoName.Properties.LookupItems.Text := ADOQuery1.FieldByName('ToCoNo').asstring;
 end;

 procedure TfrmKnitDRtInPut.JSQtyUnitChange(Sender: TObject);
@ -204,7 +220,7 @@ begin
      end;
      RTSetsavedata(ADOCmd, 'Knit_Cloth_DR_Main', ScrollBox1, 1);
      FieldByName('DRMID').Value := Trim(MaxMid);
-      FieldByName('ToCoNo').Value := Trim(ToCoName.TxtCode);
+      FieldByName('ToCoNo').Value := Trim(ToCoName.Properties.LookupItems.Text);

      FieldByName('Status').Value := '9';
      Post;
@ -447,9 +463,16 @@ begin
  WriteCxGrid(trim(self.Caption), Tv1, '·¢»õ¹ÜÀí')
 end;

-procedure TfrmKnitDRtInPut.ToCoNameBtnUpClick(Sender: TObject);
-begin
+procedure TfrmKnitDRtInPut.ToCoNameDblClick(Sender: TObject);

+begin
+  ToCoName.Text := '';
+  ToCoName.Properties.LookupItems.Text := '';
+end;
+
+procedure TfrmKnitDRtInPut.ToCoNameButtonClick(Sender: TObject;
+  AButtonIndex: Integer);
+begin
  try
    frmCompanySel := TfrmCompanySel.Create(Application);
    with frmCompanySel do
@ -457,7 +480,7 @@ begin
      FCoType := '¿Í»§';
      if ShowModal = 1 then
      begin
-        self.ToCoName.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
+        self.ToCoName.Properties.LookupItems.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
        self.ToCoName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString);
      end;
    end;
@ -465,12 +488,6 @@ begin
  finally
    frmCompanySel.Free;
  end;
-
-end;
-
-procedure TfrmKnitDRtInPut.ToCoNameBtnDnClick(Sender: TObject);
-begin
-  ToCoName.Text := '';
 end;

 end.
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitPlanSel.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitPlanSel.dfm
@ -6,34 +6,28 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
  ClientWidth = 1595
  Color = clWhite
  Font.Charset = GB2312_CHARSET
-  Font.Height = -12
-  Font.Name = #23435#20307
  Position = poScreenCenter
  OnClose = FormClose
+  ExplicitLeft = -436
  ExplicitWidth = 1611
  ExplicitHeight = 562
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 21
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1595
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 99
    Caption = 'ToolBar1'
    Color = clWhite
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -12
-    Font.Name = #23435#20307
-    Font.Style = []
-    Images = ImageList1
+    DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
-    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
    object ToolButton1: TToolButton
@ -53,7 +47,7 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
      OnClick = TBSaveClick
    end
    object TBClose: TToolButton
-      Left = 166
+      Left = 174
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -63,9 +57,9 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
  end
  object Panel1: TPanel [1]
    Left = 0
-    Top = 38
+    Top = 30
    Width = 1595
-    Height = 59
+    Height = 83
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -73,191 +67,136 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
    object Label3: TLabel
      Left = 39
      Top = 10
-      Width = 52
-      Height = 12
+      Width = 64
+      Height = 21
      Caption = #35745#21010#21333#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label2: TLabel
      Left = 243
      Top = 10
-      Width = 52
-      Height = 12
+      Width = 64
+      Height = 21
      Caption = #20135#21697#21517#31216
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label4: TLabel
      Left = 447
      Top = 10
-      Width = 26
-      Height = 12
+      Width = 32
+      Height = 21
      Caption = #39068#33394
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label5: TLabel
      Left = 447
-      Top = 37
-      Width = 26
-      Height = 12
+      Top = 49
+      Width = 32
+      Height = 21
      Caption = #33394#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label6: TLabel
      Left = 620
      Top = 10
-      Width = 26
-      Height = 12
+      Width = 32
+      Height = 21
      Caption = #33457#22411
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label7: TLabel
      Left = 243
-      Top = 37
-      Width = 52
-      Height = 12
+      Top = 49
+      Width = 64
+      Height = 21
      Caption = #20135#21697#32534#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label8: TLabel
      Left = 38
-      Top = 37
-      Width = 53
-      Height = 12
+      Top = 49
+      Width = 58
+      Height = 21
      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 Label1: TLabel
      Left = 620
-      Top = 37
-      Width = 26
-      Height = 12
+      Top = 49
+      Width = 32
+      Height = 21
      Caption = #23458#25143
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
+    end
+    object OrderNo: TcxTextEdit
+      Tag = 2
+      Left = 102
+      Top = 6
      ParentFont = False
-    end
-    object OrderNo: TEdit
-      Tag = 2
-      Left = 97
-      Top = 6
-      Width = 120
-      Height = 20
      TabOrder = 0
-      OnChange = OrderNoChange
-    end
-    object C_Name: TEdit
-      Tag = 2
-      Left = 301
-      Top = 6
      Width = 120
-      Height = 20
+    end
+    object C_Name: TcxTextEdit
+      Tag = 2
+      Left = 313
+      Top = 6
+      ParentFont = False
      TabOrder = 1
-      OnChange = OrderNoChange
-    end
-    object C_Color: TEdit
-      Tag = 2
-      Left = 476
-      Top = 6
      Width = 120
-      Height = 20
+    end
+    object C_Color: TcxTextEdit
+      Tag = 2
+      Left = 485
+      Top = 6
+      ParentFont = False
      TabOrder = 2
-      OnChange = OrderNoChange
-    end
-    object C_ColorNo: TEdit
-      Tag = 2
-      Left = 476
-      Top = 33
      Width = 120
-      Height = 20
+    end
+    object C_ColorNo: TcxTextEdit
+      Tag = 2
+      Left = 485
+      Top = 44
+      ParentFont = False
      TabOrder = 3
-      OnChange = OrderNoChange
+      Width = 120
    end
-    object C_Pattern: TEdit
+    object C_Pattern: TcxTextEdit
      Tag = 2
-      Left = 649
+      Left = 658
      Top = 6
-      Width = 120
-      Height = 20
+      ParentFont = False
      TabOrder = 4
-      OnChange = OrderNoChange
-    end
-    object C_Code: TEdit
-      Tag = 2
-      Left = 300
-      Top = 33
      Width = 120
-      Height = 20
+    end
+    object C_Code: TcxTextEdit
+      Tag = 2
+      Left = 313
+      Top = 44
+      ParentFont = False
      TabOrder = 5
-      OnChange = OrderNoChange
-    end
-    object ConNo: TEdit
-      Tag = 2
-      Left = 97
-      Top = 33
      Width = 120
-      Height = 20
+    end
+    object ConNo: TcxTextEdit
+      Tag = 2
+      Left = 102
+      Top = 44
+      ParentFont = False
      TabOrder = 6
-      OnChange = OrderNoChange
-    end
-    object CustName: TEdit
-      Tag = 2
-      Left = 649
-      Top = 33
      Width = 120
-      Height = 20
+    end
+    object CustName: TcxTextEdit
+      Tag = 2
+      Left = 658
+      Top = 44
+      ParentFont = False
      TabOrder = 7
-      OnChange = OrderNoChange
+      Width = 120
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
-    Top = 97
+    Top = 113
    Width = 1595
-    Height = 426
+    Height = 410
    Align = alClient
    PopupMenu = PopupMenu1
    TabOrder = 2
    object Tv1: TcxGridDBTableView
      OnDblClick = TV1DblClick
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_1
      DataController.Filter.AutoDataSetFilter = True
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -273,14 +212,17 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
      object v1Column7: TcxGridDBColumn
        Caption = #36873#25321
        DataBinding.FieldName = 'Ssel'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxCheckBoxProperties'
        Properties.ImmediatePost = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 56
      end
      object Tv1Column11: TcxGridDBColumn
        Caption = #23458#25143
        DataBinding.FieldName = 'CustName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -288,32 +230,33 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
      object v1OrderNo: TcxGridDBColumn
        Caption = #35745#21010#21333#21495
        DataBinding.FieldName = 'OrderNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 72
      end
      object v1ConNo: TcxGridDBColumn
        Caption = #21512#21516#21495
        DataBinding.FieldName = 'ConNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 68
      end
      object v1DeliveryDate: TcxGridDBColumn
        Caption = #20132#36135#26085#26399
        DataBinding.FieldName = 'DlyDate'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxDateEditProperties'
        Properties.ShowTime = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 66
      end
      object Tv1Column10: TcxGridDBColumn
        Caption = #35745#21010#21333#21495
        DataBinding.FieldName = 'orderno'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 79
@ -321,6 +264,7 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
      object Tv1Column4: TcxGridDBColumn
        Caption = #23458#25143#21333#21495
        DataBinding.FieldName = 'BuyConNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 80
@ -328,41 +272,46 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
      object Tv1Column5: TcxGridDBColumn
        Caption = #24037#33402
        DataBinding.FieldName = 'Technics'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
      end
      object Tv1Column2: TcxGridDBColumn
        Caption = #21152#24037#21378
        DataBinding.FieldName = 'FtyName'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 138
      end
      object v1OrdDefStr1: TcxGridDBColumn
        Caption = #20135#21697#32534#21495
        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 90
      end
      object v1MPRTCodeName: TcxGridDBColumn
        Caption = #20135#21697#21517#31216
        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 70
      end
      object v1MPRTSpec: TcxGridDBColumn
        Caption = #35268#26684
        DataBinding.FieldName = 'C_Spec'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 68
      end
      object Tv1Column1: TcxGridDBColumn
        Caption = #25104#20998
        DataBinding.FieldName = 'C_Composition'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -370,68 +319,71 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
      object v1MPRTMF: TcxGridDBColumn
        Caption = #38376#24133
        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 70
      end
      object v1MPRTKZ: TcxGridDBColumn
        Caption = #20811#37325
        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 54
      end
      object v1PRTColor: TcxGridDBColumn
        Caption = #39068#33394
        DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 63
      end
      object v1Column1: TcxGridDBColumn
        Caption = #33394#21495
        DataBinding.FieldName = 'C_ColorNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 56
      end
      object v1Column6: TcxGridDBColumn
        Caption = #33457#22411
        DataBinding.FieldName = 'C_Pattern'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 80
      end
      object v1Column4: TcxGridDBColumn
        Caption = #35745#21010#21305#25968
        DataBinding.FieldName = 'OrdPiece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 87
      end
      object v1PRTOrderQty: TcxGridDBColumn
        Caption = #35745#21010#25968#37327
        DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 75
      end
      object v1Column5: TcxGridDBColumn
        Caption = #25968#37327#21333#20301
        DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Options.Focusing = False
        Width = 62
      end
      object v1Column3: TcxGridDBColumn
        Caption = #20844#26020#25968
        DataBinding.FieldName = 'PRTOrderKgQty'
+        DataBinding.IsNullValueType = True
        Visible = False
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
@ -440,6 +392,7 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
      object Tv1Column3: TcxGridDBColumn
        Caption = #22791#27880
        DataBinding.FieldName = 'OrdSNote'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 66
@ -447,24 +400,31 @@ inherited frmKnitPlanSel: TfrmKnitPlanSel
      object Tv1Column6: TcxGridDBColumn
        Caption = #24211#23384#21305#25968
        DataBinding.FieldName = 'SumPiece'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 66
      end
      object Tv1Column8: TcxGridDBColumn
        Caption = #25209#21495
        DataBinding.FieldName = 'BatchNo'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 80
      end
      object Tv1Column7: TcxGridDBColumn
        Caption = #24211#23384#25968#37327
        DataBinding.FieldName = 'SumStkGrossWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
        Width = 66
      end
      object Tv1Column9: TcxGridDBColumn
        Caption = #32455#26426#21495
        DataBinding.FieldName = 'Loom'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 68
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitPlanSel.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitPlanSel.pas
@ -11,7 +11,23 @@ uses
  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxCheckBox,
-  cxCalendar, Vcl.Menus;
+  cxCalendar, Vcl.Menus, 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, cxContainer;

 type
  TfrmKnitPlanSel = class(TfrmBaseHelp)
@ -62,15 +78,15 @@ type
    Label6: TLabel;
    Label7: TLabel;
    Label8: TLabel;
-    OrderNo: TEdit;
-    C_Name: TEdit;
-    C_Color: TEdit;
-    C_ColorNo: TEdit;
-    C_Pattern: TEdit;
-    C_Code: TEdit;
-    ConNo: TEdit;
+    OrderNo: TcxTextEdit;
+    C_Name: TcxTextEdit;
+    C_Color: TcxTextEdit;
+    C_ColorNo: TcxTextEdit;
+    C_Pattern: TcxTextEdit;
+    C_Code: TcxTextEdit;
+    ConNo: TcxTextEdit;
    Label1: TLabel;
-    CustName: TEdit;
+    CustName: TcxTextEdit;
    Tv1Column6: TcxGridDBColumn;
    Tv1Column7: TcxGridDBColumn;
    Tv1Column8: TcxGridDBColumn;
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitStockTakinglist.dfm
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitStockTakinglist.dfm
@ -4,32 +4,30 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
  Caption = #30424#24211#21015#34920
  ClientHeight = 592
  ClientWidth = 1366
+  ParentFont = False
+  Font.Charset = ANSI_CHARSET
+  Font.Height = -16
+  Font.Name = #24494#36719#38597#40657
  Position = poScreenCenter
  ExplicitWidth = 1382
  ExplicitHeight = 631
  PixelsPerInch = 96
-  TextHeight = 12
+  TextHeight = 21
  object ToolBar1: TToolBar [0]
    Tag = 1
    Left = 0
    Top = 0
    Width = 1366
-    Height = 38
+    Height = 30
    AutoSize = True
-    ButtonHeight = 38
-    ButtonWidth = 91
+    ButtonHeight = 30
+    ButtonWidth = 99
    Caption = 'ToolBar1'
    Color = clSkyBlue
-    DisabledImages = DataLink_KnitClothStk.ImageList_new32
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -12
-    Font.Name = #23435#20307
-    Font.Style = []
-    Images = DataLink_KnitClothStk.ImageList_new32
+    DisabledImages = DataLink_KnitClothStk.cxImageList_bar
+    Images = DataLink_KnitClothStk.cxImageList_bar
    List = True
    ParentColor = False
-    ParentFont = False
    ShowCaptions = True
    TabOrder = 0
    object TBRafresh: TToolButton
@ -57,7 +55,7 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      OnClick = TchkClick
    end
    object Tnochk: TToolButton
-      Left = 237
+      Left = 245
      Top = 0
      AutoSize = True
      Caption = #30424#28857#32467#26463
@ -65,7 +63,7 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      OnClick = TnochkClick
    end
    object TBExport: TToolButton
-      Left = 332
+      Left = 348
      Top = 0
      AutoSize = True
      Caption = #23548#20986
@ -73,7 +71,7 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      OnClick = TBExportClick
    end
    object ToolButton1: TToolButton
-      Left = 403
+      Left = 419
      Top = 0
      AutoSize = True
      Caption = #20445#23384#26684#24335
@ -81,7 +79,7 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      OnClick = ToolButton1Click
    end
    object TBClose: TToolButton
-      Left = 498
+      Left = 522
      Top = 0
      AutoSize = True
      Caption = #20851#38381
@ -91,9 +89,9 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
  end
  object Panel1: TPanel [1]
    Left = 0
-    Top = 38
+    Top = 30
    Width = 1366
-    Height = 47
+    Height = 83
    Align = alTop
    BevelInner = bvRaised
    BevelOuter = bvLowered
@ -101,30 +99,18 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
    ParentBackground = False
    TabOrder = 1
    object Label1: TLabel
-      Left = 23
-      Top = 15
-      Width = 52
-      Height = 12
+      Left = 663
+      Top = 127
+      Width = 64
+      Height = 21
      Caption = #30003#35831#26085#26399
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label3: TLabel
-      Left = 463
-      Top = 15
-      Width = 26
-      Height = 12
+      Left = 197
+      Top = 48
+      Width = 32
+      Height = 21
      Caption = #21697#21517
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label4: TLabel
      Left = 440
@ -142,8 +128,8 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
    object Label6: TLabel
      Left = 320
      Top = 108
-      Width = 24
-      Height = 12
+      Width = 32
+      Height = 21
      Caption = #20179#24211
    end
    object Label8: TLabel
@ -173,81 +159,67 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      ParentFont = False
    end
    object Label5: TLabel
-      Left = 177
-      Top = 15
-      Width = 6
-      Height = 12
+      Left = 817
+      Top = 127
+      Width = 7
+      Height = 21
      Caption = '-'
    end
    object Label10: TLabel
-      Left = 292
-      Top = 15
-      Width = 52
-      Height = 12
+      Left = 25
+      Top = 48
+      Width = 64
+      Height = 21
      Caption = #30424#28857#21333#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object Label7: TLabel
-      Left = 630
-      Top = 13
-      Width = 68
-      Height = 16
+      Left = 337
+      Top = 48
+      Width = 64
+      Height = 21
      Caption = #25195#25551#20837#21475
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
    end
    object BegDate: TDateTimePicker
-      Left = 81
-      Top = 11
+      Left = 721
+      Top = 123
      Width = 90
-      Height = 20
+      Height = 29
      Date = 40675.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.464742650459811600
      TabOrder = 0
    end
    object EndDate: TDateTimePicker
-      Left = 189
-      Top = 11
+      Left = 829
+      Top = 123
      Width = 90
-      Height = 20
+      Height = 29
      Date = 40675.000000000000000000
      Format = 'yyyy-MM-dd'
      Time = 0.464761099538009100
      TabOrder = 1
    end
-    object C_Name: TEdit
+    object C_Name: TcxTextEdit
      Tag = 2
-      Left = 495
-      Top = 11
-      Width = 100
-      Height = 20
+      Left = 233
+      Top = 42
+      ParentFont = False
      TabOrder = 2
-      OnChange = C_NameChange
+      Width = 100
    end
-    object P_Code: TEdit
+    object P_Code: TcxTextEdit
      Tag = 2
      Left = 496
      Top = 111
-      Width = 100
-      Height = 20
+      ParentFont = False
      TabOrder = 3
-      OnChange = C_NameChange
+      Width = 100
    end
    object ckName: TComboBox
      Left = 348
      Top = 104
      Width = 100
-      Height = 20
+      Height = 29
      Style = csDropDownList
      ItemIndex = 0
      TabOrder = 4
@ -255,58 +227,70 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      Items.Strings = (
        #26679#21697#20179#24211)
    end
-    object kuwei: TEdit
+    object kuwei: TcxTextEdit
      Tag = 2
      Left = 996
      Top = 108
-      Width = 100
-      Height = 20
+      ParentFont = False
      TabOrder = 5
-      OnChange = C_NameChange
+      Width = 100
    end
-    object custName: TEdit
+    object custName: TcxTextEdit
      Tag = 2
      Left = 236
      Top = 111
-      Width = 100
-      Height = 20
+      ParentFont = False
      TabOrder = 6
-      OnChange = C_NameChange
-    end
-    object KCSTMID: TEdit
-      Tag = 2
-      Left = 350
-      Top = 11
      Width = 100
-      Height = 20
-      TabOrder = 7
-      OnChange = C_NameChange
    end
-    object Edit1: TEdit
+    object KCSTMID: TcxTextEdit
+      Tag = 2
+      Left = 93
+      Top = 42
+      ParentFont = False
+      TabOrder = 7
+      Width = 100
+    end
+    object Edit1: TcxTextEdit
      Tag = 9
-      Left = 704
-      Top = 9
-      Width = 151
-      Height = 24
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
+      Left = 405
+      Top = 42
      ParentFont = False
      TabOrder = 8
      OnKeyPress = Edit1KeyPress
+      Width = 151
+    end
+    inline frmFrameDateSel: TfrmFrameDateSel
+      Left = 2
+      Top = 2
+      Width = 1362
+      Height = 37
+      Align = alTop
+      TabOrder = 9
+      ExplicitLeft = 2
+      ExplicitTop = 2
+      ExplicitWidth = 1362
+      inherited BegDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited EndDate: TcxDateEdit
+        ExplicitHeight = 33
+      end
+      inherited cbbType: TcxComboBox
+        ExplicitHeight = 33
+      end
    end
  end
  object cxGrid1: TcxGrid [2]
    Left = 0
-    Top = 147
+    Top = 175
    Width = 1366
-    Height = 445
+    Height = 417
    Align = alClient
    TabOrder = 2
    object Tv1: TcxGridDBTableView
      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
      DataController.DataSource = DS_1
      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
      DataController.Summary.DefaultGroupSummaryItems = <
@ -322,10 +306,10 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      OptionsCustomize.ColumnFiltering = False
      OptionsView.Footer = True
      OptionsView.GroupByBox = False
-      Styles.Header = DataLink_KnitClothStk.Default
      object v1inoutNO: TcxGridDBColumn
        Caption = #30424#28857#21333#21495
        DataBinding.FieldName = 'KCSTMID'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 88
@ -333,6 +317,7 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      object v1CRTime: TcxGridDBColumn
        Caption = #24320#22987#30424#28857#26085#26399
        DataBinding.FieldName = 'begTime'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 120
@ -340,6 +325,7 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      object v1Column3: TcxGridDBColumn
        Caption = #32467#26463#30424#28857#26102#38388
        DataBinding.FieldName = 'endTime'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 126
@ -347,12 +333,14 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      object Tv1Column1: TcxGridDBColumn
        Caption = #26465#30721
        DataBinding.FieldName = 'StkId'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Width = 78
      end
      object v1P_Color: TcxGridDBColumn
        Caption = #32534#21495
        DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
        Width = 68
@ -360,6 +348,7 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      object v1P_CodeName: TcxGridDBColumn
        Caption = #21697#21517
        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
        PropertiesClassName = 'TcxButtonEditProperties'
        Properties.Buttons = <
          item
@ -373,64 +362,49 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      object v1Column1: TcxGridDBColumn
        Caption = #26465#30721
        DataBinding.FieldName = 'StkId'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Styles.Content = DataLink_KnitClothStk.FontBlue
-        Styles.Footer = DataLink_KnitClothStk.FontBlue
-        Styles.Header = DataLink_KnitClothStk.FontBlue
        Width = 115
      end
      object Tv1Column3: TcxGridDBColumn
        Caption = #31859#25968
        DataBinding.FieldName = 'StkMeter'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Styles.Content = DataLink_KnitClothStk.FontBlue
-        Styles.Footer = DataLink_KnitClothStk.FontBlue
-        Styles.Header = DataLink_KnitClothStk.FontBlue
        Width = 72
      end
      object Tv1Column5: TcxGridDBColumn
        Caption = #37325#37327
        DataBinding.FieldName = 'StkGrossWeight'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Styles.Content = DataLink_KnitClothStk.FontBlue
-        Styles.Footer = DataLink_KnitClothStk.FontBlue
-        Styles.Header = DataLink_KnitClothStk.FontBlue
        Width = 66
      end
      object Tv1Column6: TcxGridDBColumn
        Caption = #30424#28857#26102#38388
        DataBinding.FieldName = 'STTime'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Styles.Content = DataLink_KnitClothStk.FonePurple
-        Styles.Footer = DataLink_KnitClothStk.FonePurple
-        Styles.GroupSummary = DataLink_KnitClothStk.FonePurple
-        Styles.Header = DataLink_KnitClothStk.FonePurple
        Width = 79
      end
      object Tv1Column8: TcxGridDBColumn
        Caption = #30424#28857#20154
        DataBinding.FieldName = 'STer'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Styles.Content = DataLink_KnitClothStk.FonePurple
-        Styles.Footer = DataLink_KnitClothStk.FonePurple
-        Styles.GroupSummary = DataLink_KnitClothStk.FonePurple
-        Styles.Header = DataLink_KnitClothStk.FonePurple
        Width = 71
      end
      object Tv1Column9: TcxGridDBColumn
        Caption = #30424#28857#32467#26524
        DataBinding.FieldName = 'STResult'
+        DataBinding.IsNullValueType = True
        HeaderAlignmentHorz = taCenter
        Options.Editing = False
-        Styles.Content = DataLink_KnitClothStk.FonePurple
-        Styles.Footer = DataLink_KnitClothStk.FonePurple
-        Styles.GroupSummary = DataLink_KnitClothStk.FonePurple
-        Styles.Header = DataLink_KnitClothStk.FonePurple
        Width = 80
      end
    end
@ -438,62 +412,39 @@ inherited frmKnitStockTakinglist: TfrmKnitStockTakinglist
      GridView = Tv1
    end
  end
-  object MovePanel2: TMovePanel [3]
-    Left = 544
-    Top = 244
-    Width = 289
-    Height = 49
-    BevelInner = bvLowered
-    Caption = #27491#22312#25191#34892#25968#25454#25805#20316#65292#35831#31245#21518#12290#12290#12290
-    Color = clSkyBlue
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clRed
-    Font.Height = -14
-    Font.Name = #23435#20307
-    Font.Style = [fsBold]
-    ParentFont = False
-    TabOrder = 3
-    Visible = False
-  end
-  object cxTabControl1: TcxTabControl [4]
+  object cxTabControl1: TcxTabControl [3]
    Left = 0
-    Top = 120
+    Top = 148
    Width = 1366
    Height = 27
    Align = alTop
-    Font.Charset = GB2312_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -19
-    Font.Name = #40657#20307
-    Font.Style = [fsBold]
-    ParentFont = False
    TabOrder = 4
    Properties.CustomButtons.Buttons = <>
-    Properties.Style = 6
-    Properties.TabIndex = 0
+    Properties.Style = 9
+    Properties.TabIndex = 1
    Properties.Tabs.Strings = (
      #30424#28857#20013
      #30424#28857#23436
      #20840#37096)
+    LookAndFeel.SkinName = 'WXI'
    OnChange = cxTabControl1Change
-    ClientRectBottom = 29
-    ClientRectRight = 1366
-    ClientRectTop = 29
+    ClientRectRight = 0
+    ClientRectTop = 0
  end
-  object Pnl_msg: TPanel [5]
+  object Pnl_msg: TPanel [4]
    Left = 0
-    Top = 85
+    Top = 113
    Width = 1366
    Height = 35
    Align = alTop
    Caption = 'msg'
    Font.Charset = GB2312_CHARSET
    Font.Color = clRed
-    Font.Height = -24
-    Font.Name = #23435#20307
+    Font.Height = -16
+    Font.Name = #24494#36719#38597#40657
    Font.Style = []
    ParentFont = False
-    TabOrder = 5
+    TabOrder = 3
    Visible = False
  end
  inherited ADOQueryBaseCmd: TADOQuery
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitStockTakinglist.pas
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/U_KnitStockTakinglist.pas
@ -12,7 +12,24 @@ uses
  RM_Class, RM_e_Xls, RM_GridReport, RM_System, RM_Dataset, cxPC, MovePanel,
  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
  cxCheckBox, cxSplitter, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  U_BaseList, Winapi.MMSystem;
+  U_BaseList, Winapi.MMSystem, 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, cxContainer, cxTextEdit,
+  FrameDateSel;

 type
  TfrmKnitStockTakinglist = class(TfrmBaseList)
@ -32,8 +49,8 @@ type
    v1CRTime: TcxGridDBColumn;
    Label3: TLabel;
    Label4: TLabel;
-    C_Name: TEdit;
-    P_Code: TEdit;
+    C_Name: TcxTextEdit;
+    P_Code: TcxTextEdit;
    ADOQueryCmd: TADOQuery;
    ADOQueryTmp: TADOQuery;
    DS_1: TDataSource;
@ -43,16 +60,15 @@ type
    Label6: TLabel;
    v1P_Color: TcxGridDBColumn;
    v1inoutNO: TcxGridDBColumn;
-    kuwei: TEdit;
+    kuwei: TcxTextEdit;
    Label8: TLabel;
-    custName: TEdit;
+    custName: TcxTextEdit;
    Label2: TLabel;
    Tchk: TToolButton;
    Tnochk: TToolButton;
    Label5: TLabel;
    v1Column1: TcxGridDBColumn;
    v1Column3: TcxGridDBColumn;
-    MovePanel2: TMovePanel;
    Tv1Column3: TcxGridDBColumn;
    ADOQueryMain: TADOQuery;
    Tv1Column5: TcxGridDBColumn;
@ -61,12 +77,13 @@ type
    Tv1Column8: TcxGridDBColumn;
    Tv1Column9: TcxGridDBColumn;
    Label10: TLabel;
-    KCSTMID: TEdit;
+    KCSTMID: TcxTextEdit;
    ToolButton1: TToolButton;
    Tv1Column1: TcxGridDBColumn;
    Label7: TLabel;
-    Edit1: TEdit;
+    Edit1: TcxTextEdit;
    Pnl_msg: TPanel;
+    frmFrameDateSel: TfrmFrameDateSel;
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormDestroy(Sender: TObject);
    procedure C_NameChange(Sender: TObject);
@ -140,8 +157,8 @@ begin
        1:
          begin
            sql.Add('and isnull(A.Status,''0'') =''1'' ');
-            sql.Add('and A.begTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' ');
-            sql.Add('and A.begTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' ');
+            sql.Add('and A.begTime>=''' + formatdateTime('yyyy-MM-dd', frmFrameDateSel.begdate.Date) + ''' ');
+            sql.Add('and A.begTime<''' + formatdateTime('yyyy-MM-dd', frmFrameDateSel.enddate.Date + 1) + ''' ');
          end;
        2:
          begin
@ -222,8 +239,8 @@ end;
 procedure TfrmKnitStockTakinglist.FormCreate(Sender: TObject);
 begin
  inherited;
-  EndDate.DateTime := SGetServerDateTime(ADOQueryTmp);
-  BegDate.DateTime := EndDate.DateTime - 20;
+  frmFrameDateSel.EndDate.Date := SGetServerDateTime(ADOQueryTmp);
+  frmFrameDateSel.BegDate.Date := frmFrameDateSel.EndDate.Date - 20;

 end;

@ -271,9 +288,9 @@ begin
    Application.MessageBox('取应收最大号失败!', '提示', 0);
    Exit;
  end;
-  MovePanel2.Left := (self.Width - MovePanel2.Width) div 2;
-  MovePanel2.Visible := True;
-  MovePanel2.Refresh;
+//  MovePanel2.Left := (self.Width - MovePanel2.Width) div 2;
+//  MovePanel2.Visible := True;
+//  MovePanel2.Refresh;
  ADOQueryCmd.Connection.BeginTrans;
  try
  ////////////////////插入盘点表/////////////////////////////
@ -291,11 +308,11 @@ begin
      execsql;
    end;

-    MovePanel2.Visible := false;
+//    MovePanel2.Visible := false;
    ADOQueryCmd.Connection.CommitTrans;
    TBRafresh.Click;
  except
-    MovePanel2.Visible := false;
+//    MovePanel2.Visible := false;
    ADOQueryCmd.Connection.RollbackTrans;
    application.MessageBox('生成盘点数据错误!', '提示信息', MB_ICONERROR);
  end;
@ -324,6 +341,8 @@ begin
  end;
 end;

+
+
 procedure TfrmKnitStockTakinglist.ToolButton1Click(Sender: TObject);
 begin
  writeCxGrid(self.Caption, Tv1, '成品仓库');
--- a/项目代码/RTBasicsV1/D03针织坯布仓库/testDll.identcache
+++ b/项目代码/RTBasicsV1/D03针织坯布仓库/testDll.identcache