cai1.14

A01基础公司管理/Company.dpr

@@ -29,7 +29,8 @@ uses
   U_CompressionFun in '..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas',
   U_BankList in 'U_BankList.pas' {frmBankList},
   U_LabelMapSet in '..\A00通用窗体\U_LabelMapSet.pas' {frmLabelMapSet},
-  U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint};
+  U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint},
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
 
 {$R *.res}
 

A01基础公司管理/Company.dproj

@@ -4,7 +4,7 @@
         <MainSource>Company.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.2</ProjectVersion>
@@ -13,16 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
-        <Base_Android64>true</Base_Android64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
@@ -43,24 +33,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
-        <Cfg_2_Android64>true</Cfg_2_Android64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
-        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
-        <Cfg_2_OSX64>true</Cfg_2_OSX64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -84,13 +56,6 @@
         <VerInfo_Locale>2052</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android64)'!=''">
-        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
-        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
@@ -113,17 +78,8 @@
         <DCC_Optimize>false</DCC_Optimize>
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\恒溢水洗\A01基础公司管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10sxYilanbuyi\A01基础公司管理\testDll.exe</Debugger_HostApplication>
         <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>
     </PropertyGroup>
     <ItemGroup>
@@ -194,6 +150,7 @@
             <Form>frmLabelPrint</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -216,10 +173,6 @@
                 </Source>
             </Delphi.Personality>
             <Platforms>
-                <Platform value="Android64">True</Platform>
-                <Platform value="iOSDevice64">True</Platform>
-                <Platform value="Linux64">True</Platform>
-                <Platform value="OSX64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>

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

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas</Transaction>
+    <Transaction>2025/12/26 16:17:37.521,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>
@@ -51,6 +52,7 @@
     <File Path="..\..\..\public10\ThreeFun\Fun"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>
     <File Path="..\..\..\public10\ThreeFun\Fun\U_RTFun.pas"/>
+    <File Path="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
     <File Path="U_CustInput.pas"/>
     <File Path="U_CustInput.dfm"/>
     <File Path="U_DataLink.pas"/>

A01基础公司管理/Company.skincfg

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

A01基础公司管理/U_BankList.dfm

@@ -5,6 +5,7 @@ inherited frmBankList: TfrmBankList
   ClientHeight = 562
   ClientWidth = 1183
   KeyPreview = True
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1199
   ExplicitHeight = 601
   PixelsPerInch = 96
@@ -94,6 +95,7 @@ inherited frmBankList: TfrmBankList
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -126,6 +128,7 @@ inherited frmBankList: TfrmBankList
       object v2Column1: TcxGridDBColumn
         Caption = #24207#21495
         DataBinding.FieldName = 'SerialNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column1PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -134,6 +137,7 @@ inherited frmBankList: TfrmBankList
       object Tv2Column3: TcxGridDBColumn
         Caption = #21517#31216
         DataBinding.FieldName = 'BankName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -142,6 +146,7 @@ inherited frmBankList: TfrmBankList
       object Tv2Column4: TcxGridDBColumn
         Caption = #21345#21495
         DataBinding.FieldName = 'BankCardNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -150,6 +155,7 @@ inherited frmBankList: TfrmBankList
       object Tv2Column1: TcxGridDBColumn
         Caption = #24065#31181
         DataBinding.FieldName = 'Currency'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxComboBoxProperties'
         Properties.DropDownListStyle = lsFixedList
         Properties.Items.Strings = (
@@ -163,6 +169,7 @@ inherited frmBankList: TfrmBankList
       object Tv2Column5: TcxGridDBColumn
         Caption = #24320#25143#34892
         DataBinding.FieldName = 'BankDeposit'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -171,6 +178,7 @@ inherited frmBankList: TfrmBankList
       object Tv2Column6: TcxGridDBColumn
         Caption = #34892#21495
         DataBinding.FieldName = 'BankNo'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter

A01基础公司管理/U_BankList.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
+  dxScrollbarAnnotations;
 
 type
   TfrmBankList = class(TfrmBaseList)
@@ -64,6 +65,7 @@ type
     procedure btnokClick(Sender: TObject);
     procedure v2Column1PropertiesEditValueChanged(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     { Private declarations }
     procedure InitGrid();
@@ -108,6 +110,16 @@ begin
   frmBankList := nil;
 end;
 
+procedure TfrmBankList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmBankList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -125,7 +137,7 @@ begin
   inherited;
   ReadCxGrid(Trim(Self.Caption), Tv2, '²ÆÎñ¹ÜÀí');
   InitGrid();
-
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmBankList.TBRafreshClick(Sender: TObject);

A01基础公司管理/U_Company.dfm

@@ -7,6 +7,7 @@ inherited frmCompany: TfrmCompany
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1382
   ExplicitHeight = 650
   PixelsPerInch = 96
@@ -105,6 +106,7 @@ inherited frmCompany: TfrmCompany
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -124,6 +126,7 @@ inherited frmCompany: TfrmCompany
       object v2Column2: TcxGridDBColumn
         Caption = #20844#21496#32534#21495
         DataBinding.FieldName = 'CoCode'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Width = 86
@@ -131,6 +134,7 @@ inherited frmCompany: TfrmCompany
       object v2Column6: TcxGridDBColumn
         Caption = #20844#21496#21517#31216
         DataBinding.FieldName = 'CoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Focusing = False
         Width = 127
@@ -138,6 +142,7 @@ inherited frmCompany: TfrmCompany
       object Tv1Column1: TcxGridDBColumn
         Caption = #20844#21496#31616#31216
         DataBinding.FieldName = 'CoAbbrName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 151
@@ -145,6 +150,7 @@ inherited frmCompany: TfrmCompany
       object v2Column10: TcxGridDBColumn
         Caption = #20844#21496#22320#22336
         DataBinding.FieldName = 'CoAddress'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 173
       end

A01基础公司管理/U_Company.pas

@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu;
+  dxBarBuiltInMenu, dxScrollbarAnnotations;
 
 type
   TfrmCompany = class(TfrmBaseList)
@@ -56,6 +56,7 @@ type
     procedure btnFindClick(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
     procedure ToolButton5Click(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     fFlileFlag: string;
     { Private declarations }
@@ -105,6 +106,16 @@ begin
 //  frmCustomer:=nil;
 end;
 
+procedure TfrmCompany.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmCompany.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -143,6 +154,7 @@ begin
   inherited;
   ReadCxGrid(trim(self.Caption), Tv1, '¿Í»§¹ÜÀí');
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmCompany.TBRafreshClick(Sender: TObject);

A01基础公司管理/U_Customer.dfm

@@ -7,6 +7,7 @@ inherited frmCustomer: TfrmCustomer
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1382
   ExplicitHeight = 650
   PixelsPerInch = 96
@@ -217,6 +218,7 @@ inherited frmCustomer: TfrmCustomer
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
       DataController.DataSource = DS_1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -245,6 +247,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column1: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -253,6 +256,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column2: TcxGridDBColumn
         Caption = #23458#25143#32534#21495
         DataBinding.FieldName = 'CoCode'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -261,6 +265,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column6: TcxGridDBColumn
         Caption = #23458#25143#20840#31216
         DataBinding.FieldName = 'CoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -269,6 +274,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column15: TcxGridDBColumn
         Caption = #23458#25143#31616#31216
         DataBinding.FieldName = 'CoAbbrName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 100
@@ -276,6 +282,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column10: TcxGridDBColumn
         Caption = #19994#21153#21592
         DataBinding.FieldName = 'Saleser'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 84
@@ -283,6 +290,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column7: TcxGridDBColumn
         Caption = #20844#21496#22320#22336
         DataBinding.FieldName = 'CoAddress'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -291,6 +299,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column1: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -299,6 +308,7 @@ inherited frmCustomer: TfrmCustomer
       object v2Column3: TcxGridDBColumn
         Caption = #22269#23478
         DataBinding.FieldName = 'cocountry'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 99
@@ -306,6 +316,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column2: TcxGridDBColumn
         Caption = #23458#25143#31561#32423
         DataBinding.FieldName = 'CoLevel'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -313,6 +324,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column3: TcxGridDBColumn
         Caption = #30331#35760#26102#38388
         DataBinding.FieldName = 'Filltime'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -320,6 +332,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column4: TcxGridDBColumn
         Caption = #30331#35760#20154
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -327,6 +340,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column5: TcxGridDBColumn
         Caption = #29702#21333
         DataBinding.FieldName = 'Tallyer'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 99
@@ -334,6 +348,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column7: TcxGridDBColumn
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'ParentCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 86
@@ -341,6 +356,7 @@ inherited frmCustomer: TfrmCustomer
       object Tv1Column6: TcxGridDBColumn
         Caption = #23458#25143#31867#22411
         DataBinding.FieldName = 'KHType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 66
@@ -369,6 +385,7 @@ inherited frmCustomer: TfrmCustomer
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
         Navigator.Buttons.Delete.Visible = False
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_2
         DataController.Summary.DefaultGroupSummaryItems = <>
         DataController.Summary.FooterSummaryItems = <
@@ -391,6 +408,7 @@ inherited frmCustomer: TfrmCustomer
         object v3Column3: TcxGridDBColumn
           Caption = #40664#35748
           DataBinding.FieldName = 'IsDefault'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
@@ -399,6 +417,7 @@ inherited frmCustomer: TfrmCustomer
         object cxGridDBColumn1: TcxGridDBColumn
           Caption = #32852#31995#20154
           DataBinding.FieldName = 'Contacts'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.CharCase = ecUpperCase
           HeaderAlignmentHorz = taCenter
@@ -407,6 +426,7 @@ inherited frmCustomer: TfrmCustomer
         object cxGridDBColumn2: TcxGridDBColumn
           Caption = #32844#20301
           DataBinding.FieldName = 'position'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.CharCase = ecUpperCase
           HeaderAlignmentHorz = taCenter
@@ -415,6 +435,7 @@ inherited frmCustomer: TfrmCustomer
         object cxGridDBColumn4: TcxGridDBColumn
           Caption = #32852#31995#30005#35805
           DataBinding.FieldName = 'Telephone'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.CharCase = ecUpperCase
           HeaderAlignmentHorz = taCenter
@@ -423,6 +444,7 @@ inherited frmCustomer: TfrmCustomer
         object cxGridDBColumn5: TcxGridDBColumn
           Caption = #25163#26426#21495
           DataBinding.FieldName = 'PhoneNumber'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.CharCase = ecUpperCase
           HeaderAlignmentHorz = taCenter
@@ -431,6 +453,7 @@ inherited frmCustomer: TfrmCustomer
         object Tv2Column1: TcxGridDBColumn
           Caption = 'EMAIL'
           DataBinding.FieldName = 'Email'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.CharCase = ecUpperCase
           HeaderAlignmentHorz = taCenter
@@ -439,6 +462,7 @@ inherited frmCustomer: TfrmCustomer
         object v3Column2: TcxGridDBColumn
           Caption = #24494#20449#21495
           DataBinding.FieldName = 'WeChat'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 169
         end

A01基础公司管理/U_Customer.pas

@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, cxPC;
+  dxBarBuiltInMenu, cxPC, dxScrollbarAnnotations;
 
 type
   TfrmCustomer = class(TfrmBaseList)
@@ -100,6 +100,7 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
     procedure CoCodeChange(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     fFlileFlag: string;
     { Private declarations }
@@ -233,6 +234,16 @@ begin
   frmCustomer := nil;
 end;
 
+procedure TfrmCustomer.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmCustomer.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -282,6 +293,7 @@ begin
   ReadCxGrid(trim(self.caption) + 'Tv2', Tv2, '¿Í»§¹ÜÀí');
   SetStatus();
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmCustomer.TBRafreshClick(Sender: TObject);

A01基础公司管理/U_EmployeeList.dfm

@@ -3,6 +3,7 @@ inherited frmEmployeeList: TfrmEmployeeList
   Caption = #21592#24037#26723#26696#21015#34920
   ClientHeight = 509
   ClientWidth = 1432
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1448
   ExplicitHeight = 548
   PixelsPerInch = 96
@@ -292,6 +293,7 @@ inherited frmEmployeeList: TfrmEmployeeList
     OptionsView.CellAutoHeight = True
     OptionsView.Headers = False
     RootValue = -1
+    ScrollbarAnnotations.CustomAnnotations = <>
     Styles.Inactive = DataLink_Company.Red
     Styles.Selection = DataLink_Company.Red
     Styles.IncSearch = DataLink_Company.Red
@@ -359,6 +361,7 @@ inherited frmEmployeeList: TfrmEmployeeList
       TabOrder = 1
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DataSource1
         DataController.Filter.AutoDataSetFilter = True
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -372,6 +375,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1Column4: TcxGridDBColumn
           Caption = #36873#25321
           DataBinding.FieldName = 'SSel'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
           Properties.ImmediatePost = True
           HeaderAlignmentHorz = taCenter
@@ -380,6 +384,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1RuZhiDate: TcxGridDBColumn
           Caption = #20837#32844#26085#26399
           DataBinding.FieldName = 'EntryDate'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 84
@@ -387,6 +392,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1YGNo: TcxGridDBColumn
           Caption = #32534#21495
           DataBinding.FieldName = 'EECode'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 70
@@ -394,6 +400,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1YGName: TcxGridDBColumn
           Caption = #22995#21517
           DataBinding.FieldName = 'EEName'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 88
@@ -401,6 +408,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1Column1: TcxGridDBColumn
           Caption = #37096#38376
           DataBinding.FieldName = 'Dept'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxButtonEditProperties'
           Properties.Buttons = <
             item
@@ -414,6 +422,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1Column2: TcxGridDBColumn
           Caption = #23703#20301
           DataBinding.FieldName = 'Post'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 82
@@ -421,6 +430,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1Column8: TcxGridDBColumn
           Caption = #31867#21035
           DataBinding.FieldName = 'EEType'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 78
@@ -428,6 +438,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1SFZNo: TcxGridDBColumn
           Caption = #36523#20221#35777#21495
           DataBinding.FieldName = 'IdCard'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 70
@@ -435,6 +446,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1Column6: TcxGridDBColumn
           Caption = #24615#21035
           DataBinding.FieldName = 'Sex'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 85
@@ -442,6 +454,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1Column29: TcxGridDBColumn
           Caption = #25163#26426
           DataBinding.FieldName = 'Phone'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 91
@@ -449,6 +462,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object v1SJLiZhiDate: TcxGridDBColumn
           Caption = #31163#32844#26085#26399
           DataBinding.FieldName = 'SJLiZhiDate'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxDateEditProperties'
           Properties.SaveTime = False
           Properties.ShowTime = False
@@ -460,12 +474,14 @@ inherited frmEmployeeList: TfrmEmployeeList
         object Tv1Column1: TcxGridDBColumn
           Caption = #31163#32844#26102#38388
           DataBinding.FieldName = 'DepartureDate'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 69
         end
         object Tv1Column2: TcxGridDBColumn
           Caption = #36523#20221#35777#21040#26399#26085#26399
           DataBinding.FieldName = 'IDCardEndData'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 126
@@ -473,6 +489,7 @@ inherited frmEmployeeList: TfrmEmployeeList
         object Tv1Column3: TcxGridDBColumn
           Caption = #23478#24237#20303#22336
           DataBinding.FieldName = 'HomeAddress'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 77
@@ -480,12 +497,14 @@ inherited frmEmployeeList: TfrmEmployeeList
         object Tv1Column4: TcxGridDBColumn
           Caption = #32534#21495
           DataBinding.FieldName = 'eeno'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Width = 70
         end
         object Tv1Column5: TcxGridDBColumn
           Caption = #21047#21345#24037#24207
           DataBinding.FieldName = 'glidename'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           HeaderAlignmentHorz = taCenter
           Width = 70

A01基础公司管理/U_EmployeeList.pas

@@ -13,7 +13,7 @@ uses
   cxDropDownEdit, cxPC, cxTL, cxMaskEdit, cxInplaceContainer, cxDBTL, cxTLData,
   cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxBarBuiltInMenu,
   cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  cxTextEdit;
+  cxTextEdit, dxScrollbarAnnotations;
 
 type
   TfrmEmployeeList = class(TfrmBaseList)
@@ -110,6 +110,7 @@ type
     procedure TCXLZClick(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     canshu1: string;
     DQdate: TDateTime;
@@ -141,6 +142,16 @@ begin
   frmEmployeeList := nil;
 end;
 
+procedure TfrmEmployeeList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmEmployeeList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -375,6 +386,8 @@ begin
   if cxTabControl1.TabIndex <> 0 then
     v1SJLiZhiDate.Visible := true;
   InitForm();
+
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmEmployeeList.CheckBox1Click(Sender: TObject);

A01基础公司管理/U_Factory.dfm

@@ -7,6 +7,7 @@ inherited frmFactory: TfrmFactory
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1382
   ExplicitHeight = 840
   PixelsPerInch = 96
@@ -209,6 +210,7 @@ inherited frmFactory: TfrmFactory
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
       DataController.DataSource = DS_1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -235,6 +237,7 @@ inherited frmFactory: TfrmFactory
       object v2Column5: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -243,6 +246,7 @@ inherited frmFactory: TfrmFactory
       object v2Column2: TcxGridDBColumn
         Caption = #20379#24212#21830#32534#21495
         DataBinding.FieldName = 'CoCode'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -251,6 +255,7 @@ inherited frmFactory: TfrmFactory
       object v2Column6: TcxGridDBColumn
         Caption = #20379#24212#21830#20840#31216
         DataBinding.FieldName = 'CoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 127
@@ -258,6 +263,7 @@ inherited frmFactory: TfrmFactory
       object v2Column15: TcxGridDBColumn
         Caption = #20379#24212#21830#31616#31216
         DataBinding.FieldName = 'CoAbbrName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 100
@@ -265,6 +271,7 @@ inherited frmFactory: TfrmFactory
       object v2Column3: TcxGridDBColumn
         Caption = #20379#24212#21830#31867#22411
         DataBinding.FieldName = 'CoBusinessType'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 74
@@ -272,6 +279,7 @@ inherited frmFactory: TfrmFactory
       object v2Column1: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'CONote'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -280,6 +288,7 @@ inherited frmFactory: TfrmFactory
       object v2Column12: TcxGridDBColumn
         Caption = #25805#20316#21592
         DataBinding.FieldName = 'Filler'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 60
@@ -287,6 +296,7 @@ inherited frmFactory: TfrmFactory
       object v2Column4: TcxGridDBColumn
         Caption = #36319#21333#21592
         DataBinding.FieldName = 'Follower'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 78
@@ -294,6 +304,7 @@ inherited frmFactory: TfrmFactory
       object Tv1Column1: TcxGridDBColumn
         Caption = #19978#32423#21333#20301
         DataBinding.FieldName = 'ParentCoName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 108
@@ -322,6 +333,7 @@ inherited frmFactory: TfrmFactory
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
         Navigator.Buttons.Delete.Visible = False
+        ScrollbarAnnotations.CustomAnnotations = <>
         DataController.DataSource = DS_2
         DataController.Summary.DefaultGroupSummaryItems = <>
         DataController.Summary.FooterSummaryItems = <
@@ -345,6 +357,7 @@ inherited frmFactory: TfrmFactory
         object v3Column3: TcxGridDBColumn
           Caption = #40664#35748
           DataBinding.FieldName = 'IsDefault'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxCheckBoxProperties'
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
@@ -353,6 +366,7 @@ inherited frmFactory: TfrmFactory
         object Tv2Column1: TcxGridDBColumn
           Caption = #32852#31995#20154
           DataBinding.FieldName = 'Contacts'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.CharCase = ecUpperCase
           HeaderAlignmentHorz = taCenter
@@ -361,6 +375,7 @@ inherited frmFactory: TfrmFactory
         object Tv2Column2: TcxGridDBColumn
           Caption = #32852#31995#30005#35805
           DataBinding.FieldName = 'bossphone'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 96
@@ -368,6 +383,7 @@ inherited frmFactory: TfrmFactory
         object cxGridDBColumn1: TcxGridDBColumn
           Caption = #25163#26426#21495
           DataBinding.FieldName = 'PhoneNumber'
+          DataBinding.IsNullValueType = True
           PropertiesClassName = 'TcxTextEditProperties'
           Properties.CharCase = ecUpperCase
           HeaderAlignmentHorz = taCenter
@@ -376,6 +392,7 @@ inherited frmFactory: TfrmFactory
         object Tv2Column3: TcxGridDBColumn
           Caption = #22791#27880
           DataBinding.FieldName = 'note'
+          DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 120

A01基础公司管理/U_Factory.pas

@@ -14,7 +14,7 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
-  dxBarBuiltInMenu, U_BaseList, cxPC;
+  dxBarBuiltInMenu, U_BaseList, cxPC, dxScrollbarAnnotations;
 
 type
   TfrmFactory = class(TFrmBaseList)
@@ -92,6 +92,7 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton8Click(Sender: TObject);
     procedure CoCodeChange(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     { Private declarations }
     procedure InitGrid();
@@ -215,6 +216,16 @@ begin
   frmFactory := nil;
 end;
 
+procedure TfrmFactory.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmFactory.FactTypeChange(Sender: TObject);
 begin
   InitGrid();
@@ -270,7 +281,7 @@ begin
   SetStatus();
 
   InitGrid();
-
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmFactory.TBRafreshClick(Sender: TObject);

A01基础公司管理/U_GetDllForm.pas

@@ -71,11 +71,11 @@ begin
 
   if trim(DataBaseStr) = '' then
   begin
-    server := '121.40.233.100,7781';
+    server := '112.14.44.145';
-    pswd := 'rightsoft@123';
+    dtbase := 'yilanbuyidata';
+    user := 'yilansa';
+    pswd := 'yilanbuyi@123';
 
-    dtbase := 'hengyisxdata';
-    user := 'sa';
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 //    Parameters1 := '录入';
     Parameters1 := '管理';

A01基础公司管理/U_ModulePromptList.dfm

@@ -4,6 +4,7 @@ inherited frmModulePromptList: TfrmModulePromptList
   Caption = #25105#30340#31649#23478
   ClientHeight = 508
   ClientWidth = 1321
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1337
   ExplicitHeight = 547
   PixelsPerInch = 96
@@ -82,9 +83,9 @@ inherited frmModulePromptList: TfrmModulePromptList
     Height = 429
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 83
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       OnCellDblClick = Tv1CellDblClick
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -118,12 +119,14 @@ inherited frmModulePromptList: TfrmModulePromptList
       object v1Column5: TcxGridDBColumn
         Caption = #24453#22788#29702#20107#39033
         DataBinding.FieldName = 'ModuleName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 235
       end
       object v1Column1: TcxGridDBColumn
         Caption = #22788#29702#20154
         DataBinding.FieldName = 'DName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 107
       end

A01基础公司管理/U_ModulePromptList.pas

@@ -11,7 +11,8 @@ uses
   cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class,
   RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxPC,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
+  dxScrollbarAnnotations;
 
 type
   TfrmModulePromptList = class(TfrmBaseList)
@@ -39,6 +40,7 @@ type
     procedure FormShow(Sender: TObject);
     procedure cxPageControl1Change(Sender: TObject);
     procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     fDConString_link1: string;
     procedure InitGrid();
@@ -79,6 +81,16 @@ begin
   frmModulePromptList := nil;
 end;
 
+procedure TfrmModulePromptList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmModulePromptList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -131,6 +143,7 @@ procedure TfrmModulePromptList.FormShow(Sender: TObject);
 begin
   inherited;
   InitForm();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmModulePromptList.cxPageControl1Change(Sender: TObject);

A01基础公司管理/U_SYDept.dfm

@@ -4,6 +4,7 @@ inherited frmSYDept: TfrmSYDept
   Caption = #32452#32455#32467#26500
   ClientHeight = 470
   ClientWidth = 988
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1004
   ExplicitHeight = 509
   PixelsPerInch = 96
@@ -92,13 +93,12 @@ inherited frmSYDept: TfrmSYDept
     OptionsView.CellAutoHeight = True
     OptionsView.Headers = False
     RootValue = -1
+    ScrollbarAnnotations.CustomAnnotations = <>
     Styles.Inactive = DataLink_Company.Red
     Styles.Selection = DataLink_Company.Red
     Styles.IncSearch = DataLink_Company.Red
     TabOrder = 1
     OnClick = cxDBTreeList1Click
-    ExplicitTop = 18
-    ExplicitHeight = 452
     object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn
       DataBinding.FieldName = 'DPName'
       Width = 210
@@ -119,9 +119,6 @@ inherited frmSYDept: TfrmSYDept
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 2
-    ExplicitTop = 18
-    ExplicitWidth = 379
-    ExplicitHeight = 452
     object Label1: TLabel
       Left = 41
       Top = 40

A01基础公司管理/U_SYDept.pas

@@ -10,7 +10,7 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxGridCustomView, cxGrid, cxTextEdit, cxLookAndFeels,
   cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, cxNavigator, U_BaseList,
-  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges;
+  dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxScrollbarAnnotations;
 
 type
   TfrmSYDept = class(TfrmBaseList)
@@ -48,6 +48,7 @@ type
     procedure TBDelClick(Sender: TObject);
     procedure DPNameKeyPress(Sender: TObject; var Key: Char);
     procedure FormShow(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     { Private declarations }
     PState: Integer;
@@ -96,6 +97,16 @@ begin
   frmSYDept := nil;
 end;
 
+procedure TfrmSYDept.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmSYDept.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -270,6 +281,7 @@ procedure TfrmSYDept.FormShow(Sender: TObject);
 begin
   inherited;
   InitTree();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 end.

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

@@ -22,14 +22,14 @@
     <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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.936,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A02基础产品管理\U_ClothInfoInput.pas</Transaction>

A02基础产品管理/U_ClothInfo.pas

@@ -322,11 +322,20 @@ begin
     MBCIID := Trim(CDS_1.FieldByName('BCIID').AsString)
   else
     MBCIID := '';
-
   Pwhere := SGetFilters(Panel1, 1, 2);
 
   if cxTabControl1.TabIndex < 2 then
-    Pwhere := 'isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' ';
+  begin
+    if Pwhere <> '' then
+    begin
+      Pwhere := Pwhere + ' and isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' ';
+    end
+    else
+    begin
+      Pwhere := 'isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' ';
+    end;
+  end;
+
 
   if trim(C_NameGY.Text) <> '' then
   begin

A02基础产品管理/U_ClothInfoInput.pas

@@ -1144,6 +1144,7 @@ begin
         FieldByName('EditId').Value := Trim(DCode);
         FieldByName('EDITER').Value := Trim(DName);
         FieldByName('EDITTIME').Value := SGetServerDateTime(ADOQueryTemp);
+
       end
       else
       begin
@@ -1693,6 +1694,35 @@ begin
 //    C_Code.Text := MC_Code;
 //
 //  end;
+  if (CopyInt = 0) or (CopyInt = 2) then   //新增    复制
+  begin
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      SQL.Add(' select * from BS_Cloth_Info where C_Name = ' + QuotedStr(Trim(C_Name.Text)));
+      Open;
+    end;
+  end
+  else if CopyInt = 3 then  //修改
+  begin
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      SQL.Add(' select * from BS_Cloth_Info where C_Name = ' + QuotedStr(Trim(C_Name.Text)));
+      sql.Add(' and BCIID <> ' + QuotedStr(Trim(FBCIID)));
+      Open;
+    end;
+  end;
+
+  if not ADOQueryCmd.IsEmpty then
+  begin
+   Application.MessageBox('产品名称重复！','提示信息',MB_OK);
+   exit;
+  end;
+
+
 
   if SaveData() then
   begin

A02基础产品管理/U_ClothType.dfm

@@ -93,6 +93,7 @@ inherited frmClothType: TfrmClothType
     Styles.IncSearch = DataLink_ClothInfo.FoneRed
     TabOrder = 1
     OnClick = cxDBTreeList1Click
+    ExplicitLeft = -6
     object cxDBTreeList1cxDBTreeListColumn2: TcxDBTreeListColumn
       DataBinding.FieldName = 'CTName'
       Width = 210

A05基础资料管理/BaseInfo.dpr

@@ -23,7 +23,8 @@ uses
   U_MachineManage in 'U_MachineManage.pas' {frmMachineManage},
   U_PositionList in 'U_PositionList.pas' {frmPositionList},
   U_WarpBeamManage in 'U_WarpBeamManage.pas' {frmWarpBeamManage},
-  U_TrayManage in 'U_TrayManage.pas' {frmTrayManage};
+  U_TrayManage in 'U_TrayManage.pas' {frmTrayManage},
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
 
 {$R *.res}
 

A05基础资料管理/BaseInfo.dproj

@@ -4,7 +4,7 @@
         <MainSource>BaseInfo.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.2</ProjectVersion>
@@ -13,16 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
-        <Base_Android64>true</Base_Android64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
@@ -43,24 +33,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
-        <Cfg_2_Android64>true</Cfg_2_Android64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
-        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
-        <Cfg_2_OSX64>true</Cfg_2_OSX64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -84,13 +56,6 @@
         <VerInfo_Locale>2052</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android64)'!=''">
-        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
-        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
@@ -113,17 +78,8 @@
         <DCC_Optimize>false</DCC_Optimize>
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10sxYilanbuyi\A05基础资料管理\testDll.exe</Debugger_HostApplication>
         <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>
     </PropertyGroup>
     <ItemGroup>
@@ -177,6 +133,7 @@
             <Form>frmTrayManage</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -199,10 +156,6 @@
                 </Source>
             </Delphi.Personality>
             <Platforms>
-                <Platform value="Android64">True</Platform>
-                <Platform value="iOSDevice64">True</Platform>
-                <Platform value="Linux64">True</Platform>
-                <Platform value="OSX64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>

A05基础资料管理/BaseInfo.dproj.local

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>2025/12/26 16:33:50.878,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
   </Transactions>
 </BorlandProject>

A05基础资料管理/BaseInfo.skincfg

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

A05基础资料管理/U_MachineManage.dfm

@@ -5,6 +5,7 @@ inherited frmMachineManage: TfrmMachineManage
   ClientHeight = 523
   ClientWidth = 1107
   KeyPreview = True
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1123
   ExplicitHeight = 562
   PixelsPerInch = 96
@@ -104,6 +105,7 @@ inherited frmMachineManage: TfrmMachineManage
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_HZ
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -141,12 +143,14 @@ inherited frmMachineManage: TfrmMachineManage
       object v2Column1: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         HeaderAlignmentHorz = taCenter
       end
       object v2Column12: TcxGridDBColumn
         Caption = #26426#21488#21495
         DataBinding.FieldName = 'MCNO'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -155,6 +159,7 @@ inherited frmMachineManage: TfrmMachineManage
       object v2Column8: TcxGridDBColumn
         Caption = #26426#21488#31867#22411
         DataBinding.FieldName = 'MCType'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter

A05基础资料管理/U_MachineManage.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
+  dxScrollbarAnnotations;
 
 type
   TfrmMachineManage = class(TfrmBaseList)
@@ -67,6 +68,7 @@ type
     procedure ToolButton5Click(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
     procedure Tv2Column1PropertiesChange(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     { Private declarations }
     procedure PrintReport(FZDYNo: string);
@@ -145,6 +147,16 @@ begin
   frmMachineManage := nil;
 end;
 
+procedure TfrmMachineManage.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmMachineManage.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -164,6 +176,7 @@ begin
 //  Enddate.DateTime:=SGetServerDate(ADOQueryTemp);
 //  begdate.DateTime:=Enddate.DateTime-30;
   InitGrid();
+  KeyPreview := True;
 end;
 
 procedure TfrmMachineManage.TBRafreshClick(Sender: TObject);

A05基础资料管理/U_PositionList.dfm

@@ -5,6 +5,7 @@ inherited frmPositionList: TfrmPositionList
   ClientHeight = 532
   ClientWidth = 1107
   KeyPreview = True
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1123
   ExplicitHeight = 571
   PixelsPerInch = 96
@@ -100,11 +101,11 @@ inherited frmPositionList: TfrmPositionList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 102
     object Tv2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_HZ
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -136,12 +137,14 @@ inherited frmPositionList: TfrmPositionList
       object v2Column1: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         HeaderAlignmentHorz = taCenter
       end
       object v2Column12: TcxGridDBColumn
         Caption = #24211#20301#32534#21495
         DataBinding.FieldName = 'POSNO'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -150,6 +153,7 @@ inherited frmPositionList: TfrmPositionList
       object v2Column8: TcxGridDBColumn
         Caption = #24211#20301#21517#31216
         DataBinding.FieldName = 'POSName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = v2Column8PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter

A05基础资料管理/U_PositionList.pas

@@ -14,7 +14,8 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList;
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
+  dxScrollbarAnnotations;
 
 type
   TfrmPositionList = class(TfrmBaseList)
@@ -66,6 +67,7 @@ type
     procedure ToolButton4Click(Sender: TObject);
     procedure ToolButton5Click(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     { Private declarations }
     procedure PrintReport(FZDYNo: string);
@@ -166,6 +168,16 @@ begin
   frmPositionList := nil;
 end;
 
+procedure TfrmPositionList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmPositionList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -185,6 +197,7 @@ begin
 //  Enddate.DateTime:=SGetServerDate(ADOQueryTemp);
 //  begdate.DateTime:=Enddate.DateTime-30;
   InitGrid();
+  KeyPreview := True;
 end;
 
 procedure TfrmPositionList.TBRafreshClick(Sender: TObject);

B03基础物料仓库/ProductStk.dproj.local

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj</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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.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.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.923,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj</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.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.713,=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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.495,=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.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.686,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F01染色坯布仓库/U_DyeGreyClothInEdit.dfm

@@ -10,6 +10,8 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit
   Font.Name = #23435#20307
   Position = poScreenCenter
   OnClose = FormClose
+  OnKeyDown = FormKeyDown
+  ExplicitLeft = -471
   ExplicitWidth = 1356
   ExplicitHeight = 585
   PixelsPerInch = 96

F01染色坯布仓库/U_DyeGreyClothInEdit.pas

@@ -80,6 +80,7 @@ type
     procedure Tv1Column8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure Tv1OrderNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure TbImportClick(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     { Private declarations }
     function SaveCKData(): Boolean;
@@ -288,6 +289,16 @@ begin
   Close;
 end;
 
+procedure TfrmDyeGreyClothInEdit.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeGreyClothInEdit.FormShow(Sender: TObject);
 var
   fsj: string;
@@ -305,6 +316,7 @@ begin
   end;
   SCreateCDS(ADOQueryTemp, CDS_Sub);
   SInitCDSData(ADOQueryTemp, CDS_Sub);
+  KeyPreview := True;  // 确保表单可以预览按键
 //  fsj := 'select name=CJName ,Code=null from CheJian';
 //  SInitCxGridComboBoxBySql(ADOQueryTemp, v1Column7, fsj, 0, True, '');
 end;

F01染色坯布仓库/U_DyeGreyClothInList.dfm

@@ -4,6 +4,7 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
   Caption = #22383#24067#20837#24211#21015#34920
   ClientHeight = 543
   ClientWidth = 1284
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1300
   ExplicitHeight = 582
   PixelsPerInch = 96
@@ -115,7 +116,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    ExplicitTop = 32
     object Label1: TLabel
       Left = 28
       Top = 12
@@ -229,7 +229,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 97
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

F01染色坯布仓库/U_DyeGreyClothInList.pas

@@ -96,6 +96,7 @@ type
     procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
     procedure OrderNoKeyPress(Sender: TObject; var Key: Char);
     procedure IOTypeChange(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
 
   private
     canshu1, canshu2, canshu3, FWorkshop: string;
@@ -141,6 +142,16 @@ begin
 
 end;
 
+procedure TfrmDyeGreyClothInList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeGreyClothInList.InitGrid();
 begin
   try
@@ -275,6 +286,7 @@ begin
   BegDate.DateTime := SGetServerDate(ADOQueryCmd) - 2;
   EndDate.DateTime := SGetServerDate(ADOQueryCmd);
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyeGreyClothInList.TBExportClick(Sender: TObject);

F01染色坯布仓库/U_DyeGreyClothOutEdit.dfm

@@ -10,6 +10,7 @@ inherited frmDyeGreyClothOutEdit: TfrmDyeGreyClothOutEdit
   Font.Name = #23435#20307
   Position = poMainFormCenter
   OnClose = FormClose
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1422
   ExplicitHeight = 585
   PixelsPerInch = 96

F01染色坯布仓库/U_DyeGreyClothOutEdit.pas

@@ -58,6 +58,7 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure v1Column13PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     { Private declarations }
     function SaveCKData(): Boolean;
@@ -252,6 +253,16 @@ begin
   Close;
 end;
 
+procedure TfrmDyeGreyClothOutEdit.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeGreyClothOutEdit.FormShow(Sender: TObject);
 var
   fsj: string;
@@ -269,6 +280,7 @@ begin
   end;
   SCreateCDS(ADOQueryTemp, CDS_Sub);
   SInitCDSData(ADOQueryTemp, CDS_Sub);
+  KeyPreview := True;  // 确保表单可以预览按键
 //  fsj:='select name=CJName ,Code=null from CheJian';
 //  SInitCxGridComboBoxBySql(ADOQueryTemp,v1CheJian,fsj,0,True,'');
 end;

F01染色坯布仓库/U_DyeGreyClothOutList.dfm

@@ -5,6 +5,7 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
   ClientHeight = 546
   ClientWidth = 1193
   Position = poScreenCenter
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1209
   ExplicitHeight = 585
   PixelsPerInch = 96
@@ -115,7 +116,6 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
-    ExplicitTop = 44
     object Label1: TLabel
       Left = 28
       Top = 12

F01染色坯布仓库/U_DyeGreyClothOutList.pas

@@ -97,6 +97,7 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
     procedure OrderNoKeyPress(Sender: TObject; var Key: Char);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     canshu1, canshu2, FWorkshop: string;
     procedure InitGrid();
@@ -121,6 +122,16 @@ begin
   inherited;  //frmPBOutList:=nil;
 end;
 
+procedure TfrmDyeGreyClothOutList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeGreyClothOutList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -257,6 +268,7 @@ begin
   BegDate.DateTime := SGetServerDate(ADOQueryCmd) - 2;
   EndDate.DateTime := SGetServerDate(ADOQueryCmd);
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyeGreyClothOutList.TBExportClick(Sender: TObject);

F01染色坯布仓库/U_DyeGreyClothStkList.dfm

@@ -5,6 +5,7 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
   ClientHeight = 567
   ClientWidth = 1400
   Position = poDefault
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1416
   ExplicitHeight = 606
   PixelsPerInch = 96

F01染色坯布仓库/U_DyeGreyClothStkList.pas

@@ -81,6 +81,7 @@ type
     procedure Tv1Column3PropertiesEditValueChanged(Sender: TObject);
     procedure TbExportClick(Sender: TObject);
     procedure OrderNoKeyPress(Sender: TObject; var Key: Char);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     procedure InitGrid();
     { Private declarations }
@@ -105,6 +106,16 @@ begin
   frmDyeGreyClothStkList := nil;
 end;
 
+procedure TfrmDyeGreyClothStkList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeGreyClothStkList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -173,6 +184,7 @@ begin
   ReadCxGrid(trim(Self.Caption), Tv1, 'Å÷²¼¿â´æÁбí');
 
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyeGreyClothStkList.TBFindClick(Sender: TObject);

F01染色坯布仓库/U_DyeGreyClothStkSel.dfm

@@ -10,6 +10,7 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel
   Font.Name = #23435#20307
   Position = poMainFormCenter
   OnClose = FormClose
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1181
   ExplicitHeight = 566
   PixelsPerInch = 96
@@ -178,7 +179,6 @@ inherited frmDyeGreyClothStkSel: TfrmDyeGreyClothStkSel
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 71
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

F01染色坯布仓库/U_DyeGreyClothStkSel.pas

@@ -81,6 +81,7 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
     procedure ToolButton2Click(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     procedure InitGrid();
     { Private declarations }
@@ -105,6 +106,15 @@ begin
   frmDyeGreyClothStkSel := nil;
 end;
 
+procedure TfrmDyeGreyClothStkSel.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeGreyClothStkSel.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -157,6 +167,7 @@ begin
   inherited;
   ReadCxGrid(trim(self.Caption), Tv1, '»úÎïÁϲֿâ');
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyeGreyClothStkSel.TBFindClick(Sender: TObject);

F01染色坯布仓库/U_DyeGreyClothStkStats.dfm

@@ -5,6 +5,7 @@ inherited frmDyeGreyClothStkStats: TfrmDyeGreyClothStkStats
   ClientHeight = 567
   ClientWidth = 1400
   Position = poDefault
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1416
   ExplicitHeight = 606
   PixelsPerInch = 96
@@ -172,7 +173,6 @@ inherited frmDyeGreyClothStkStats: TfrmDyeGreyClothStkStats
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 111
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

F01染色坯布仓库/U_DyeGreyClothStkStats.pas

@@ -84,6 +84,7 @@ type
     procedure TbExportClick(Sender: TObject);
     procedure TbSaveClick(Sender: TObject);
     procedure finishDescriptionKeyPress(Sender: TObject; var Key: Char);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     procedure InitGrid();
     function SaveData(): Boolean;
@@ -109,6 +110,16 @@ begin
   frmDyeGreyClothStkStats := nil;
 end;
 
+procedure TfrmDyeGreyClothStkStats.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeGreyClothStkStats.finishDescriptionKeyPress(Sender: TObject;
   var Key: Char);
 begin
@@ -189,6 +200,7 @@ begin
   BegDate.DateTime := SGetServerDate(ADOQueryCmd) - 2;
   EndDate.DateTime := SGetServerDate(ADOQueryCmd);
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyeGreyClothStkStats.TBFindClick(Sender: TObject);

F01染色坯布仓库/U_DyePBImport.dfm

@@ -9,6 +9,7 @@ inherited frmDyePBImport: TfrmDyePBImport
   Font.Height = -16
   Font.Name = #24494#36719#38597#40657
   Position = poMainFormCenter
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1500
   ExplicitHeight = 601
   PixelsPerInch = 107

F01染色坯布仓库/U_DyePBImport.pas

@@ -54,6 +54,7 @@ type
     procedure ToolButton2Click(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
     procedure Tv1ioTypePropertiesEditValueChanged(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     { Private declarations }
     procedure InitGrid();
@@ -96,6 +97,16 @@ begin
   frmDyePBImport := nil;
 end;
 
+procedure TfrmDyePBImport.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyePBImport.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -123,6 +134,7 @@ begin
     CreateDataSet;
   end;
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyePBImport.TBRafreshClick(Sender: TObject);

F02染色计划单/DyePlan.dpr

@@ -42,7 +42,8 @@ uses
   U_CraftSel in 'U_CraftSel.pas' {frmCraftSel},
   U_DyeSimpleTechnicsList in 'U_DyeSimpleTechnicsList.pas' {frmDyeSimpleTechnicsList},
   U_DyeTechnicsinputKaika in 'U_DyeTechnicsinputKaika.pas' {frmDyeTechnicsinputKaika},
-  U_DyeSimpleTechnicsKaiKa in 'U_DyeSimpleTechnicsKaiKa.pas' {frmDyeSimpleTechnicsKaiKa};
+  U_DyeSimpleTechnicsKaiKa in 'U_DyeSimpleTechnicsKaiKa.pas' {frmDyeSimpleTechnicsKaiKa},
+  U_framePDList in 'U_framePDList.pas' {framePDList: TFrame};
 
 {$R *.res}
 

F02染色计划单/DyePlan.dproj

@@ -207,6 +207,11 @@
             <Form>frmDyeSimpleTechnicsKaiKa</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="U_framePDList.pas">
+            <Form>framePDList</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TFrame</DesignClass>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

F02染色计划单/DyePlan.dproj.local

@@ -1,67 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.875,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.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.188,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeProcessDefin.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.037,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_Cust_Cloth_PSC.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.362,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.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.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.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.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.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.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.383,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_CraftSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.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.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.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.213,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas</Transaction>
     <Transaction>2025/09/28 12:18:54.000.943,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeSimpleTechnicsList.pas</Transaction>
     <Transaction>2025/11/01 09:33:01.000.459,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeTechnicsinputKaika.pas</Transaction>
     <Transaction>2025/11/01 09:39:35.000.613,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeSimpleTechnicsKaiKa.pas</Transaction>
+    <Transaction>2025/12/20 11:12:54.000.352,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_framePDList.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>
@@ -137,5 +138,7 @@
     <File Path="U_DyeTechnicsinputKaika.dfm"/>
     <File Path="U_DyeSimpleTechnicsKaiKa.pas"/>
     <File Path="U_DyeSimpleTechnicsKaiKa.dfm"/>
+    <File Path="U_framePDList.pas"/>
+    <File Path="U_framePDList.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

F02染色计划单/SpliterPosition.INI

@@ -1,6 +1,6 @@
 [DyeSimpleTechnicsList_Spliter]
-Position1=902
+Position1=804
-Position2=1230
+Position2=1025
 
 [DyeTechnicsList_Spliter]
 Position=1219

F02染色计划单/U_CraftSel.dfm

@@ -42,6 +42,13 @@ inherited frmCraftSel: TfrmCraftSel
         HeaderAlignmentHorz = taCenter
         Width = 49
       end
+      object TV1F_Name: TcxGridDBColumn
+        Caption = #22383#24067#32534#21495
+        DataBinding.FieldName = 'F_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 140
+      end
       object TV1Column1: TcxGridDBColumn
         Caption = #24037#33402#32534#21495
         DataBinding.FieldName = 'DTMNO'
@@ -93,6 +100,7 @@ inherited frmCraftSel: TfrmCraftSel
     ParentFont = False
     ShowCaptions = True
     TabOrder = 1
+    ExplicitTop = -6
     object ToolButton1: TToolButton
       Left = 0
       Top = 0

F02染色计划单/U_CraftSel.pas

@@ -55,6 +55,7 @@ type
     TV1SSel: TcxGridDBColumn;
     Label2: TLabel;
     DTMName: TEdit;
+    TV1F_Name: TcxGridDBColumn;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);

F02染色计划单/U_DyePlanCardList.dfm

@@ -86,16 +86,32 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       ImageIndex = 11
       OnClick = TnochkClick
     end
-    object btnWC: TToolButton
+    object TbAbnormal: TToolButton
       Left = 521
       Top = 0
       AutoSize = True
+      Caption = #24322#24120
+      ImageIndex = 12
+      OnClick = TbAbnormalClick
+    end
+    object TnoAbnormal: TToolButton
+      Left = 592
+      Top = 0
+      AutoSize = True
+      Caption = #25764#38144#24322#24120
+      ImageIndex = 11
+      OnClick = TnoAbnormalClick
+    end
+    object btnWC: TToolButton
+      Left = 687
+      Top = 0
+      AutoSize = True
       Caption = #23436#25104
       ImageIndex = 12
       OnClick = btnWCClick
     end
     object btnnowc: TToolButton
-      Left = 592
+      Left = 758
       Top = 0
       AutoSize = True
       Caption = #25764#38144#23436#25104
@@ -103,7 +119,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       OnClick = btnnowcClick
     end
     object TbDetailGY: TToolButton
-      Left = 687
+      Left = 853
       Top = 0
       AutoSize = True
       Caption = #35814#32454#24037#33402
@@ -111,7 +127,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       OnClick = TbDetailGYClick
     end
     object TbSimpleGY: TToolButton
-      Left = 782
+      Left = 948
       Top = 0
       AutoSize = True
       Caption = #31616#26131#24037#33402
@@ -119,7 +135,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       OnClick = TbSimpleGYClick
     end
     object TbUpdateGY: TToolButton
-      Left = 877
+      Left = 1043
       Top = 0
       AutoSize = True
       Caption = #26356#26032#24037#33402
@@ -127,7 +143,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       OnClick = TbUpdateGYClick
     end
     object TBPrint: TToolButton
-      Left = 972
+      Left = 1138
       Top = 0
       AutoSize = True
       Caption = #25171#21360#27969#31243#21345
@@ -135,7 +151,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       OnClick = TBPrintClick
     end
     object TBExport: TToolButton
-      Left = 1079
+      Left = 1245
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -143,7 +159,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       OnClick = TBExportClick
     end
     object ToolButton6: TToolButton
-      Left = 1150
+      Left = 1316
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -151,7 +167,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       OnClick = ToolButton6Click
     end
     object TBClose: TToolButton
-      Left = 1245
+      Left = 1411
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -170,6 +186,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
+    ExplicitTop = 44
     object Label1: TLabel
       Left = 23
       Top = 15
@@ -291,9 +308,9 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
     object Label6: TLabel
       Left = 894
       Top = 13
-      Width = 26
+      Width = 54
       Height = 12
-      Caption = #39068#33394
+      Caption = #39068'    '#33394
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12
@@ -314,6 +331,19 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label5: TLabel
+      Left = 894
+      Top = 37
+      Width = 52
+      Height = 12
+      Caption = #24403#21069#24037#24207
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BegDate: TDateTimePicker
       Left = 81
       Top = 11
@@ -408,7 +438,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
     end
     object C_Color: TEdit
       Tag = 2
-      Left = 926
+      Left = 951
       Top = 9
       Width = 100
       Height = 20
@@ -421,6 +451,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       Top = 9
       Width = 100
       Height = 20
+      ItemIndex = 0
       TabOrder = 11
       OnChange = OrderNoChange
       Items.Strings = (
@@ -429,6 +460,15 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
         #26679#24067#21345
         #22806#22238#20462)
     end
+    object CurGlideName: TEdit
+      Tag = 2
+      Left = 951
+      Top = 33
+      Width = 100
+      Height = 20
+      TabOrder = 12
+      OnChange = OrderNoChange
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0
@@ -442,6 +482,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
+      OnCustomDrawCell = Tv1CustomDrawCell
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -684,6 +725,20 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
         Options.Editing = False
         Width = 80
       end
+      object Tv1KaZuQty: TcxGridDBColumn
+        Caption = #21345#32452#31859#25968
+        DataBinding.FieldName = 'KaZuQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1KaZuPiece: TcxGridDBColumn
+        Caption = #21345#32452#20214#25968
+        DataBinding.FieldName = 'KaZuPiece'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object v1Column13: TcxGridDBColumn
         Caption = #24037#33402#20449#24687
         DataBinding.FieldName = 'DTMPSlist'
@@ -732,12 +787,13 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
-      object Tv1Column1: TcxGridDBColumn
+      object Tv1CurGlideName: TcxGridDBColumn
         Caption = #24403#21069#24037#24207
         DataBinding.FieldName = 'CurGlideName'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
+        Styles.OnGetContentStyle = Tv1CurGlideNameStylesGetContentStyle
         Width = 66
       end
       object Tv1Column4: TcxGridDBColumn
@@ -746,7 +802,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 76
       end
       object Tv1Column5: TcxGridDBColumn
         Caption = #21047#21345#26102#38388
@@ -762,14 +818,14 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Width = 94
       end
       object Tv1Column20: TcxGridDBColumn
         Caption = #22791#27880
         DataBinding.FieldName = 'PCNote'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 66
+        Width = 78
       end
       object Tv1TotalPCID: TcxGridDBColumn
         Caption = #21345#21495
@@ -806,6 +862,21 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
+      object Tv1isStop: TcxGridDBColumn
+        Caption = #26159#21542#20572#24037
+        DataBinding.FieldName = 'isStop'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1Status: TcxGridDBColumn
+        Caption = #29366#24577
+        DataBinding.FieldName = 'Status'
+        DataBinding.IsNullValueType = True
+        Visible = False
+        Width = 80
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -820,13 +891,15 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
     TabOrder = 3
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
-    Properties.TabIndex = 1
+    Properties.TabIndex = 0
     Properties.Tabs.Strings = (
       #26410#23457#26680
       #24050#23457#26680
       #24050#23436#25104
+      #24322#24120#21345
       #20840#37096)
     OnChange = cxTabControl1Change
+    ExplicitTop = 99
     ClientRectBottom = 22
     ClientRectRight = 1503
     ClientRectTop = 19
@@ -1043,5 +1116,9 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
       Caption = #20840#24323
       OnClick = N2Click
     end
+    object N3: TMenuItem
+      Caption = #22797#21046
+      OnClick = N3Click
+    end
   end
 end

F02染色计划单/U_DyePlanCardList.pas

@@ -15,7 +15,7 @@ uses
   IdFTP, ShellAPI, cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters,
   cxNavigator, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters,
   dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList,
-  dxScrollbarAnnotations;
+  dxScrollbarAnnotations, Clipbrd;
 
 type
   TfrmDyePlanCardList = class(TfrmBaseList)
@@ -112,7 +112,7 @@ type
     tbedit: TToolButton;
     btnWC: TToolButton;
     btnnowc: TToolButton;
-    Tv1Column1: TcxGridDBColumn;
+    Tv1CurGlideName: TcxGridDBColumn;
     Tv1Column4: TcxGridDBColumn;
     Tv1Column5: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
@@ -130,6 +130,15 @@ type
     Tv1C_Color: TcxGridDBColumn;
     PCType: TComboBox;
     Label13: TLabel;
+    Label5: TLabel;
+    CurGlideName: TEdit;
+    Tv1KaZuQty: TcxGridDBColumn;
+    Tv1KaZuPiece: TcxGridDBColumn;
+    TbAbnormal: TToolButton;
+    TnoAbnormal: TToolButton;
+    N3: TMenuItem;
+    Tv1isStop: TcxGridDBColumn;
+    Tv1Status: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -157,6 +166,11 @@ type
     procedure TbUpdateGYClick(Sender: TObject);
     procedure TbSimpleGYClick(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure Tv1CurGlideNameStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+    procedure TbAbnormalClick(Sender: TObject);
+    procedure TnoAbnormalClick(Sender: TObject);
+    procedure N3Click(Sender: TObject);
+    procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
   private
     DQdate: TDateTime;
     procedure InitGrid();
@@ -228,6 +242,9 @@ begin
   tbdel.Enabled := false;
   btnWC.Enabled := false;
   btnnowc.Enabled := false;
+  TbAbnormal.Enabled := False;
+  TnoAbnormal.Enabled := false;
+
   tbadd.Enabled := true;
   if Trim(canshu1) = '录入' then
   begin
@@ -236,24 +253,21 @@ begin
     case cxTabControl1.TabIndex of
       0:
         begin
-
+          TbAbnormal.Enabled := true;
           tbedit.Enabled := true;
           tbdel.Enabled := true;
-
         end;
       1:
         begin
-
           btnWC.Enabled := true;
         end;
       2:
         begin
           btnnowc.Enabled := true;
-
         end;
       3:
         begin
-
+          TnoAbnormal.Enabled := false;
         end;
     end;
   end;
@@ -262,6 +276,7 @@ begin
     case cxTabControl1.TabIndex of
       0:
         begin
+          TbAbnormal.Enabled := true;
           tbedit.Enabled := true;
           tbdel.Enabled := true;
           tchk.Enabled := true;
@@ -279,7 +294,7 @@ begin
         end;
       3:
         begin
-
+           TnoAbnormal.Enabled := false;
         end;
     end;
   end;
@@ -291,8 +306,7 @@ begin
   frmDyePlanCardList := nil;
 end;
 
-procedure TfrmDyePlanCardList.FormKeyDown(Sender: TObject; var Key: Word;
+procedure TfrmDyePlanCardList.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-  Shift: TShiftState);
 begin
   if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
   begin
@@ -336,6 +350,9 @@ begin
       sql.Clear;
       sql.Add('select A.*,ConNo,OrdType,Salestype ,OrdDate,DlyDate');
       sql.Add(',GlideList=[dbo].[F_Dye_Card_GlideList](A.PCID) ');
+      sql.Add(',KaZuQty=(SELECT SUM(PCQty) from Dye_Plan_Card X where X.KaZu = A.KaZu)');
+      sql.Add(',KaZuPiece=(SELECT SUM(PCPiece) from Dye_Plan_Card X where X.KaZu = A.KaZu)');
+
       sql.Add('from Dye_Plan_Card A ');
       sql.Add('left join Dye_Plan_sub B on B.subID=A.subID ');
       sql.Add('left join Dye_Plan_Main C on C.mainID=A.mainID ');
@@ -344,15 +361,19 @@ begin
       case cxTabControl1.TabIndex of
         0:
           begin
-            sql.Add('  and  isnull(A.status,''0'')= ''0'' ');
+            sql.Add('  and  isnull(A.status,''0'')= ''0'' ');     //未审核
           end;
         1:
           begin
-            sql.Add('  and  isnull(A.status,''0'')=''9'' ');
+            sql.Add('  and  isnull(A.status,''0'')=''9'' ');    //已审核
           end;
         2:
           begin
-            sql.Add('  and  isnull(A.status,''0'')=''10'' ');
+            sql.Add('  and  isnull(A.status,''0'')=''10'' ');   //已完成
+          end;
+        3:
+          begin
+            sql.Add('  and  isnull(A.status,''0'')=''-1'' ');   //异常卡
           end;
 
       end;
@@ -437,23 +458,24 @@ begin
         begin
           try
             ADOQueryCmd.Connection.BeginTrans;
-            with ADOQueryCmd do
+//            with ADOQueryCmd do
-            begin
+//            begin
-              Close;
+//              Close;
-              Sql.Clear;
+//              Sql.Clear;
-              Sql.Add('exec P_BS_Cloth_Out_Del ');
+//              Sql.Add('exec P_BS_Cloth_Out_Del ');
-              Sql.Add(' @BCIOIDS=' + quotedstr(Trim(CDS_1.fieldbyname('BCIOID').AsString)));
+//              Sql.Add(' @BCIOIDS=' + quotedstr(Trim(CDS_1.fieldbyname('BCIOID').AsString)));
-              Sql.Add(',@DCode=' + quotedstr(Trim(CDS_1.fieldbyname('C_Code').AsString)));
+//              Sql.Add(',@DCode=' + quotedstr(Trim(CDS_1.fieldbyname('C_Code').AsString)));
-              Sql.Add(',@DName=' + quotedstr(Trim(CDS_1.fieldbyname('C_Name').AsString)));
+//              Sql.Add(',@DName=' + quotedstr(Trim(CDS_1.fieldbyname('C_Name').AsString)));
-              Open;
+//              Open;
-            end;
+//            end;
-            if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
+//            if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
-              raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+//              raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
 
             with ADOQueryCmd do
             begin
               Close;
               Sql.Clear;
+              //删除流程卡
               Sql.Add('exec P_Dye_Card_Del ');
               Sql.Add('@PCIDS=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
               Sql.Add(',@DCode=' + quotedstr(Trim(DCode)));
@@ -463,57 +485,68 @@ begin
             if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
               raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
 
-            with ADOQueryCmd do
+            with ADOQueryTemp do
             begin
               Close;
-              Sql.Clear;
+              SQL.Clear;
-              Sql.Add('delete from Dye_Plan_glide where PCID = ' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
+              SQL.Add('select * from Dye_Plan_card where KaZu = ' + QuotedStr(Trim(CDS_1.FieldByName('KaZu').AsString)));
-              ExecSQL;
+              Open;
             end;
-
+            //最后卡组最后一张卡删除，清除卡组数据
-            with ADOQueryCmd do
+            if ADOQueryTemp.IsEmpty then
-            begin
-              Close;
-              Sql.Clear;
-              Sql.Add('delete from Bs_Cloth_GY_Main_Kaika where PCID = ' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
-              ExecSQL;
-            end;
-
-            with ADOQueryCmd do
-            begin
-              Close;
-              Sql.Clear;
-              Sql.Add('delete from Bs_Cloth_GY_Sub_Kaika where PCID = ' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
-              ExecSQL;
-            end;
-
-            if (Trim(CDS_1.fieldbyname('PCType').AsString) = 'Õý³£¿¨') or (Trim(CDS_1.fieldbyname('PCType').AsString) = 'Ç°µÀ¿¨') then
             begin
               with ADOQueryCmd do
               begin
                 Close;
                 Sql.Clear;
+                Sql.Add('delete from Dye_Plan_glide where PCID = ' + quotedstr(Trim(CDS_1.fieldbyname('KaZu').AsString)));
+                ExecSQL;
+              end;
+
+              with ADOQueryCmd do
+              begin
+                Close;
+                Sql.Clear;
+                Sql.Add('delete from Bs_Cloth_GY_Main_Kaika where PCID = ' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
+                ExecSQL;
+              end;
+
+              with ADOQueryCmd do
+              begin
+                Close;
+                Sql.Clear;
+                Sql.Add('delete from Bs_Cloth_GY_Sub_Kaika where PCID = ' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
+                ExecSQL;
+              end;
+            end;
+
+            if (Trim(CDS_1.fieldbyname('PCType').AsString) = '正常卡') then
+            begin
+              with ADOQueryCmd do
+              begin
+                Close;
+                Sql.Clear;
+                //删除出库记录并且更新库存
                 Sql.Add('exec P_Dye_GreyCloth_Out_Del ');
                 Sql.Add('@PCID=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
                 Open;
               end;
-
-              if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
-                raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
-            end
-            else
-            begin
-              with ADOQueryCmd do
-              begin
-                Close;
-                Sql.Clear;
-                Sql.Add('exec P_Dye_Card_Move_Del ');
-                Sql.Add('@PCID=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
-                Open;
-              end;
               if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
                 raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
             end;
+//            else
+//            begin
+//              with ADOQueryCmd do
+//              begin
+//                Close;
+//                Sql.Clear;
+//                Sql.Add('exec P_Dye_Card_Move_Del ');
+//                Sql.Add('@PCID=' + quotedstr(Trim(CDS_1.fieldbyname('PCID').AsString)));
+//                Open;
+//              end;
+//              if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
+//                raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+//            end;
 
             ADOQueryCmd.Connection.CommitTrans;
           except
@@ -526,6 +559,7 @@ begin
         begin
           Close;
           Sql.Clear;
+          //更新总卡号分卡号
           Sql.Add('exec P_Dye_Plan_UpdateOrderNo ');
           Sql.Add('@KaZu=' + quotedstr(Trim(CDS_1.fieldbyname('KaZu').AsString)));
           Open;
@@ -817,6 +851,12 @@ begin
   SelOKNo(CDS_1, False);
 end;
 
+procedure TfrmDyePlanCardList.N3Click(Sender: TObject);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+
+end;
+
 procedure TfrmDyePlanCardList.tbeditClick(Sender: TObject);
 var
   MPCIDS: string;
@@ -950,7 +990,7 @@ begin
       First;
       while not Eof do
       begin
-        if Fieldbyname('Ssel').AsBoolean then
+        if Fieldbyname('Ssel').AsBoolean and (Fieldbyname('isStop').AsString = '0') then
         begin
           with ADOQueryCmd do
           begin
@@ -1001,12 +1041,171 @@ begin
   end;
 end;
 
+procedure TfrmDyePlanCardList.TbAbnormalClick(Sender: TObject);
+begin
+  if CDS_1.IsEmpty then
+    exit;
+  if CDS_1.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('没有选择数据!', '提示', 0);
+    Exit;
+  end;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with CDS_1 do
+    begin
+      DisableControls;
+      First;
+      while not Eof do
+      begin
+        if Fieldbyname('Ssel').AsBoolean then
+        begin
+          with ADOQueryCmd do
+          begin
+            close;
+            sql.Clear;
+            sql.Add('update  Dye_Plan_Card SET status=''-1'' ');
+            sql.Add(' ,Chker = ' + quotedstr(trim(DName)) + ',Chktime = getdate()');
+            sql.Add('where KaZu=' + quotedstr(trim(CDS_1.fieldbyname('KaZu').AsString)));
+            sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+            sql.Add(' ' + quotedstr(trim(DName)));
+            sql.Add(',getdate() ');
+            sql.Add(',' + quotedstr(trim(self.Caption)));
+            sql.Add(',' + quotedstr(trim('流程卡异常')));
+            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('KaZu').AsString))));
+            sql.Add(',' + quotedstr(trim('成功')));
+            sql.Add(')');
+            execsql;
+          end;
+        end;
+        Next;
+      end;
+      EnableControls;
+    end;
+
+    ADOQueryCmd.Connection.CommitTrans;
+    application.MessageBox('异常成功！', '提示信息');
+    TBRafresh.Click;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox('异常失败！', '提示信息', 0);
+  end;
+end;
+
+procedure TfrmDyePlanCardList.TnoAbnormalClick(Sender: TObject);
+begin
+  if CDS_1.IsEmpty then
+    exit;
+  if CDS_1.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('没有选择数据!', '提示', 0);
+    Exit;
+  end;
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with CDS_1 do
+    begin
+      DisableControls;
+      First;
+      while not Eof do
+      begin
+        if Fieldbyname('Ssel').AsBoolean then
+        begin
+          with ADOQueryCmd do
+          begin
+            close;
+            sql.Clear;
+            sql.Add('update  Dye_Plan_Card SET status=''0'' ');
+            sql.Add('where KaZu=' + quotedstr(trim(CDS_1.fieldbyname('KaZu').AsString)));
+            sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+            sql.Add(' ' + quotedstr(trim(DName)));
+            sql.Add(',getdate() ');
+            sql.Add(',' + quotedstr(trim(self.Caption)));
+            sql.Add(',' + quotedstr(trim('流程卡撤销异常')));
+            sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('KaZu').AsString))));
+            sql.Add(',' + quotedstr(trim('成功')));
+            sql.Add(')');
+            execsql;
+          end;
+        end;
+        Next;
+      end;
+      EnableControls;
+    end;
+
+    ADOQueryCmd.Connection.CommitTrans;
+    application.MessageBox('撤销异常成功！', '提示信息');
+    TBRafresh.Click;
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox('撤销异常失败！', '提示信息', 0);
+  end;
+end;
+
 procedure TfrmDyePlanCardList.ToolButton6Click(Sender: TObject);
 begin
   WriteCxGrid(self.Caption + 'TV1', Tv1, '生产指示单管理');
 
 end;
 
+procedure TfrmDyePlanCardList.Tv1CurGlideNameStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[Tv1CurGlideName.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      AStyle := TcxStyle.Create(nil);
+
+      if GroupValue = '已生产' then
+      begin
+        AStyle.Color := $00CCFFCC;  // 淡绿色
+      end;
+
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePlanCardList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+var
+  misStop, mstatus: Variant;
+begin
+  // 获取字段值
+  misStop := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('isStop').Index];
+  mstatus := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('status').Index];
+
+  // 设置不同状态的颜色和字体
+  if (misStop = '1') and (mstatus = '10') then               // 未排入计划单
+  begin
+    ACanvas.Brush.Color := clGray;  // 灰色背景
+    ACanvas.Font.Color := clWindowText;
+    ACanvas.Font.Style := [];
+  end
+  else  // 默认情况
+  begin
+    ACanvas.Brush.Color := clWindow;
+    ACanvas.Font.Color := clWindowText;
+    ACanvas.Font.Style := [];
+  end;
+//  if AViewInfo.GridRecord.Selected then
+//  begin
+//
+//    ACanvas.Font.Color := $000080FF;
+//    ACanvas.Font.Style := [fsBold];
+//
+//  end;
+  // 如果需要自定义绘制完成，取消下面的注释
+  // ADone := True;
+end;
+
 procedure TfrmDyePlanCardList.cxTabControl1Change(Sender: TObject);
 begin
   SetStatus();
@@ -1093,7 +1292,7 @@ begin
             sql.Add(' ' + quotedstr(trim(DName)));
             sql.Add(',getdate() ');
             sql.Add(',' + quotedstr(trim(self.Caption)));
-            sql.Add(',' + quotedstr(trim('Á÷³Ì¿¨ÉóºË')));
+            sql.Add(',' + quotedstr(trim('流程卡撤销审核')));
             sql.Add(',' + quotedstr(trim('流程卡号：' + trim(CDS_1.FieldByName('KaZu').AsString))));
             sql.Add(',' + quotedstr(trim('成功')));
             sql.Add(')');

F02染色计划单/U_DyePlanList.dfm

@@ -325,7 +325,6 @@ inherited frmDyePlanList: TfrmDyePlanList
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 2
-    ExplicitTop = 165
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

F02染色计划单/U_DyeProcessDefin.dfm

@@ -63,7 +63,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
     Height = 772
     Align = alClient
     TabOrder = 0
-    Properties.ActivePage = CCQX
+    Properties.ActivePage = PD
     Properties.CustomButtons.Buttons = <>
     ClientRectBottom = 770
     ClientRectLeft = 2
@@ -182,6 +182,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         Height = 317
         Align = alClient
         TabOrder = 0
+        ExplicitTop = -6
         object ccqx_note: TcxTextEdit
           Tag = 2
           Left = 58
@@ -357,7 +358,6 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         Height = 396
         Align = alBottom
         TabOrder = 1
-        ExplicitLeft = 1
         object Tv1: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -4485,6 +4485,56 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         end
       end
     end
+    object PD: TcxTabSheet
+      Caption = #25293#25171
+      ImageIndex = 10
+      object Panel_PD: TPanel
+        Left = 0
+        Top = 0
+        Width = 1143
+        Height = 748
+        Align = alClient
+        TabOrder = 0
+        ExplicitLeft = 3
+        object cxLabel280: TcxLabel
+          Left = 284
+          Top = 40
+          Caption = #28201#24230
+        end
+        object cxLabel281: TcxLabel
+          Left = 12
+          Top = 18
+          Caption = #24037#33402#21442#25968':'
+        end
+        object pd_temperature: TcxTextEdit
+          Tag = 2
+          Left = 321
+          Top = 41
+          Style.LookAndFeel.SkinName = 'WXI'
+          StyleDisabled.LookAndFeel.SkinName = 'WXI'
+          StyleFocused.LookAndFeel.SkinName = 'WXI'
+          StyleHot.LookAndFeel.SkinName = 'WXI'
+          TabOrder = 2
+          Width = 150
+        end
+        object pd_speed: TcxTextEdit
+          Tag = 2
+          Left = 76
+          Top = 40
+          Style.LookAndFeel.SkinName = 'WXI'
+          StyleDisabled.LookAndFeel.SkinName = 'WXI'
+          StyleFocused.LookAndFeel.SkinName = 'WXI'
+          StyleHot.LookAndFeel.SkinName = 'WXI'
+          TabOrder = 3
+          Width = 150
+        end
+        object cxLabel282: TcxLabel
+          Left = 38
+          Top = 40
+          Caption = #36710#36895
+        end
+      end
+    end
     object cxTabSheet4: TcxTabSheet
       Caption = '  '#38450#27700#26087
       Font.Charset = GB2312_CHARSET

F02染色计划单/U_DyeProcessDefin.pas

@@ -801,6 +801,13 @@ type
     gj_number: TcxTextEdit;
     fp_gjNumber: TcxTextEdit;
     cxLabel279: TcxLabel;
+    PD: TcxTabSheet;
+    Panel_PD: TPanel;
+    cxLabel280: TcxLabel;
+    cxLabel281: TcxLabel;
+    pd_temperature: TcxTextEdit;
+    pd_speed: TcxTextEdit;
+    cxLabel282: TcxLabel;
     procedure FormShow(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure TbSaveClick(Sender: TObject);
@@ -1131,6 +1138,10 @@ begin
   else if FPSType = 'Ôþë' then
   begin
     SCSHData(ADOQueryTemp, Panel_zm, 2);
+  end
+  else if FPSType = 'ÅÄ´ò' then
+  begin
+    SCSHData(ADOQueryTemp, Panel_pd, 2);
   end;
 
   if BtnInt = 3 then   //²é¿´
@@ -1296,6 +1307,7 @@ begin
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_fs, 2);
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_gj, 2);
       RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_fp, 2);
+      RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_pd, 2);
 
 //      if FPSType = 'Ôþë' then
 //      begin

F02染色计划单/U_DyeSimpleTechnicsList.dfm

@@ -5,6 +5,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
   ClientWidth = 1540
   Position = poDesigned
   OnKeyDown = FormKeyDown
+  ExplicitLeft = -9
   ExplicitWidth = 1556
   ExplicitHeight = 884
   PixelsPerInch = 96
@@ -58,16 +59,24 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
       ImageIndex = 3
       OnClick = ToolButton4Click
     end
-    object TbSave: TToolButton
+    object TbCopy: TToolButton
       Left = 284
       Top = 0
       AutoSize = True
+      Caption = #22797#21046
+      ImageIndex = 13
+      OnClick = TbCopyClick
+    end
+    object TbSave: TToolButton
+      Left = 355
+      Top = 0
+      AutoSize = True
       Caption = #20445#23384
       ImageIndex = 16
       OnClick = TbSaveClick
     end
     object TBDel: TToolButton
-      Left = 355
+      Left = 426
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -75,7 +84,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
       OnClick = TBDelClick
     end
     object Tchk: TToolButton
-      Left = 426
+      Left = 497
       Top = 0
       AutoSize = True
       Caption = #38145#23450
@@ -83,7 +92,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
       OnClick = TchkClick
     end
     object TNochk: TToolButton
-      Left = 497
+      Left = 568
       Top = 0
       AutoSize = True
       Caption = #25764#38144#38145#23450
@@ -91,7 +100,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
       OnClick = TNochkClick
     end
     object ToolButton3: TToolButton
-      Left = 592
+      Left = 663
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -99,7 +108,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
       OnClick = ToolButton3Click
     end
     object TBClose: TToolButton
-      Left = 687
+      Left = 758
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -111,32 +120,72 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
     Left = 0
     Top = 38
     Width = 1540
-    Height = 38
+    Height = 75
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clSkyBlue
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -11
+    Font.Name = #23435#20307
+    Font.Style = []
+    ParentFont = False
     TabOrder = 1
     object Label1: TLabel
       Left = 316
       Top = 13
-      Width = 48
+      Width = 44
-      Height = 12
+      Height = 11
       Caption = #24037#33402#21517#31216
     end
     object Label3: TLabel
       Left = 30
       Top = 13
-      Width = 48
+      Width = 44
-      Height = 12
+      Height = 11
       Caption = #24037#33402#32534#21495
     end
+    object Label2: TLabel
+      Left = 30
+      Top = 42
+      Width = 22
+      Height = 11
+      Caption = #23383#27597
+    end
+    object Label4: TLabel
+      Left = 182
+      Top = 42
+      Width = 22
+      Height = 11
+      Caption = #20135#21697
+    end
+    object Label5: TLabel
+      Left = 313
+      Top = 42
+      Width = 44
+      Height = 11
+      Caption = #24037#33402#35201#27714
+    end
+    object Label6: TLabel
+      Left = 443
+      Top = 31
+      Width = 105
+      Height = 33
+      Caption = #23383#27597#65306#31579#36873#31532'1'#20301#13#10#20135#21697#65306#31579#36873'2345'#20301#13#10#24037#33402#35201#27714#65306#31579#36873#31532'7'#20301
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clTeal
+      Font.Height = -11
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+    end
     object DTMName: TEdit
       Tag = 2
       Left = 366
       Top = 9
       Width = 180
-      Height = 20
+      Height = 19
       TabOrder = 0
       OnKeyPress = DTMNameKeyPress
     end
@@ -145,14 +194,38 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
       Left = 78
       Top = 9
       Width = 180
-      Height = 20
+      Height = 19
       TabOrder = 1
       OnKeyPress = DTMNoKeyPress
     end
+    object Char: TEdit
+      Left = 78
+      Top = 38
+      Width = 70
+      Height = 19
+      TabOrder = 2
+      OnKeyPress = CharKeyPress
+    end
+    object Product: TEdit
+      Left = 211
+      Top = 38
+      Width = 70
+      Height = 19
+      TabOrder = 3
+      OnKeyPress = CharKeyPress
+    end
+    object GYRequire: TEdit
+      Left = 367
+      Top = 38
+      Width = 70
+      Height = 19
+      TabOrder = 4
+      OnKeyPress = CharKeyPress
+    end
   end
   object cxTabControl1: TcxTabControl [2]
     Left = 0
-    Top = 76
+    Top = 113
     Width = 1540
     Height = 23
     Align = alTop
@@ -171,16 +244,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
   end
   object Panel2: TPanel [3]
     Left = 0
-    Top = 99
+    Top = 136
     Width = 785
-    Height = 746
+    Height = 709
     Align = alLeft
     TabOrder = 3
     object cxGrid2: TcxGrid
       Left = 1
       Top = 1
       Width = 630
-      Height = 744
+      Height = 707
       Align = alLeft
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -223,7 +296,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
           FooterAlignmentHorz = taCenter
           HeaderAlignmentHorz = taCenter
           HeaderGlyphAlignmentHorz = taCenter
-          Width = 29
+          Width = 37
         end
         object v2GYNO: TcxGridDBColumn
           Caption = #24037#33402#32534#21495
@@ -265,6 +338,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
           DataBinding.FieldName = 'Editer'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 130
         end
         object Tv2Edittime: TcxGridDBColumn
@@ -272,6 +346,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
           DataBinding.FieldName = 'Edittime'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 100
         end
       end
@@ -283,7 +358,7 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
       Left = 635
       Top = 1
       Width = 149
-      Height = 744
+      Height = 707
       Align = alClient
       TabOrder = 1
       object cxGrid1: TcxGrid
@@ -315,13 +390,64 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
           GridView = Tv1
         end
       end
-      object cxGrid9: TcxGrid
+      object ToolBar2: TToolBar
+        Tag = 1
         Left = 1
-        Top = 424
+        Top = 386
         Width = 147
-        Height = 319
+        Height = 76
-        Align = alClient
+        AutoSize = True
+        ButtonHeight = 38
+        ButtonWidth = 75
+        Caption = 'ToolBar2'
+        Images = DataLink_DyePlan.ImageList_new32
+        List = True
+        ShowCaptions = True
         TabOrder = 1
+        object ToolButton5: TToolButton
+          Left = 0
+          Top = 0
+          AutoSize = True
+          Caption = #21024#34892
+          ImageIndex = 6
+          ParentShowHint = False
+          ShowHint = False
+          OnClick = ToolButton5Click
+        end
+        object ToolButton6: TToolButton
+          Left = 71
+          Top = 0
+          AutoSize = True
+          Caption = #26174#31034
+          ImageIndex = 8
+          Wrap = True
+          OnClick = ToolButton6Click
+        end
+        object TbMoveUp: TToolButton
+          Left = 0
+          Top = 38
+          AutoSize = True
+          Caption = #19978#31227
+          ImageIndex = 19
+          OnClick = TbMoveUpClick
+        end
+        object ToolButton7: TToolButton
+          Left = 71
+          Top = 38
+          AutoSize = True
+          Caption = #19979#31227
+          ImageIndex = 17
+          OnClick = ToolButton7Click
+        end
+      end
+      object cxGrid3: TcxGrid
+        Left = 1
+        Top = 462
+        Width = 147
+        Height = 244
+        Align = alClient
+        TabOrder = 2
+        LookAndFeel.NativeStyle = False
         object Tv3: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -335,19 +461,12 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
             DataBinding.FieldName = 'PSNO'
             DataBinding.IsNullValueType = True
             HeaderAlignmentHorz = taCenter
-            Width = 41
+            Width = 46
           end
           object Tv3PSType: TcxGridDBColumn
             Caption = #24037#24207#31867#22411
             DataBinding.FieldName = 'PSType'
             DataBinding.IsNullValueType = True
-            PropertiesClassName = 'TcxButtonEditProperties'
-            Properties.Buttons = <
-              item
-                Default = True
-                Kind = bkEllipsis
-              end>
-            Properties.OnButtonClick = ButtonEdit
             HeaderAlignmentHorz = taCenter
             Width = 80
           end
@@ -373,66 +492,33 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
             Width = 80
           end
         end
-        object cxGridLevel8: TcxGridLevel
+        object cxGrid3Level1: TcxGridLevel
           GridView = Tv3
         end
       end
-      object ToolBar2: TToolBar
-        Tag = 1
-        Left = 1
-        Top = 386
-        Width = 147
-        Height = 38
-        AutoSize = True
-        ButtonHeight = 38
-        ButtonWidth = 75
-        Caption = 'ToolBar2'
-        Images = DataLink_DyePlan.ImageList_new32
-        List = True
-        ShowCaptions = True
-        TabOrder = 2
-        object ToolButton5: TToolButton
-          Left = 0
-          Top = 0
-          AutoSize = True
-          Caption = #21024#34892
-          ImageIndex = 6
-          ParentShowHint = False
-          ShowHint = False
-          OnClick = ToolButton5Click
-        end
-        object ToolButton6: TToolButton
-          Left = 71
-          Top = 0
-          AutoSize = True
-          Caption = #26174#31034
-          ImageIndex = 8
-          OnClick = ToolButton6Click
-        end
-      end
     end
     object cxSplitter1: TcxSplitter
       Left = 631
       Top = 1
       Width = 4
-      Height = 744
+      Height = 707
       AutoPosition = False
       Control = cxGrid2
     end
   end
   object ScrollBox1: TScrollBox [4]
     Left = 789
-    Top = 99
+    Top = 136
     Width = 751
-    Height = 746
+    Height = 709
     Align = alClient
     TabOrder = 4
   end
   object cxSplitter2: TcxSplitter [5]
     Left = 785
-    Top = 99
+    Top = 136
     Width = 4
-    Height = 746
+    Height = 709
     AlignSplitter = salRight
     Control = Panel2
   end
@@ -469,8 +555,8 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
   object GPM_2: TcxGridPopupMenu
     Grid = cxGrid2
     PopupMenus = <>
-    Left = 447
+    Left = 463
-    Top = 361
+    Top = 337
   end
   object DS_2: TDataSource
     DataSet = CDS_2
@@ -519,9 +605,9 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
     Top = 564
   end
   object GPM_3: TcxGridPopupMenu
-    Grid = cxGrid9
+    Grid = cxGrid3
     PopupMenus = <>
-    Left = 495
+    Left = 519
-    Top = 321
+    Top = 289
   end
 end

F02染色计划单/U_DyeSimpleTechnicsList.pas

@@ -16,7 +16,8 @@ uses
   dxBarBuiltInMenu, Menus, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters,
   dxDateRanges, dxScrollbarAnnotations, cxContainer, cxDropDownEdit, cxLabel,
   cxButtons, cxMemo, U_frameFPList, U_frameGJList, U_frameGDXList, U_frameFSList,
-  U_frameCCQXList, U_frameJGQXList, U_frameRGQXList, U_frameYMList;
+  U_frameCCQXList, U_frameJGQXList, U_frameRGQXList, U_frameYMList,
+  U_framePDList;
 
   //U_frameJGQXList, U_frameRGQXList, U_frameCCQXList, U_frameYMList
 
@@ -62,26 +63,36 @@ type
     cxGrid1: TcxGrid;
     Tv1: TcxGridDBTableView;
     cxGrid1Level1: TcxGridLevel;
-    cxGrid9: TcxGrid;
-    Tv3: TcxGridDBTableView;
-    cxGridLevel8: TcxGridLevel;
     Tv1PSType: TcxGridDBColumn;
     CDS_GX: TClientDataSet;
     DS_GX: TDataSource;
-    Tv3PSNO: TcxGridDBColumn;
-    Tv3PSType: TcxGridDBColumn;
-    Tv3PSName: TcxGridDBColumn;
-    Tv3PSID: TcxGridDBColumn;
     Tv2DTMID: TcxGridDBColumn;
     ToolBar2: TToolBar;
     ToolButton5: TToolButton;
     Tv2Editer: TcxGridDBColumn;
     Tv2Edittime: TcxGridDBColumn;
     ToolButton6: TToolButton;
-    Tv3Page: TcxGridDBColumn;
     GPM_3: TcxGridPopupMenu;
     cxSplitter2: TcxSplitter;
     cxSplitter1: TcxSplitter;
+    TbCopy: TToolButton;
+    TbMoveUp: TToolButton;
+    ToolButton7: TToolButton;
+    Label2: TLabel;
+    Label4: TLabel;
+    Label5: TLabel;
+    Char: TEdit;
+    Product: TEdit;
+    GYRequire: TEdit;
+    Label6: TLabel;
+    Tv3: TcxGridDBTableView;
+    cxGrid3Level1: TcxGridLevel;
+    cxGrid3: TcxGrid;
+    Tv3PSNO: TcxGridDBColumn;
+    Tv3PSType: TcxGridDBColumn;
+    Tv3PSName: TcxGridDBColumn;
+    Tv3PSID: TcxGridDBColumn;
+    Tv3Page: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -108,6 +119,10 @@ type
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure DTMNameKeyPress(Sender: TObject; var Key: Char);
     procedure DTMNoKeyPress(Sender: TObject; var Key: Char);
+    procedure TbCopyClick(Sender: TObject);
+    procedure TbMoveUpClick(Sender: TObject);
+    procedure ToolButton7Click(Sender: TObject);
+    procedure CharKeyPress(Sender: TObject; var Key: Char);
   private
     { Private declarations }
 
@@ -131,6 +146,7 @@ type
   public
     fPSIDList: string;
     fmanage: string;
+    fState: string;
   end;
 
 var
@@ -143,6 +159,7 @@ var
   frameRGQXList1, frameRGQXList2, frameRGQXList3: TframeRGQXList;
   frameCCQXList1, frameCCQXList2, frameCCQXList3: TframeCCQXList;
   frameYMList1, frameYMList2, frameYMList3: TframeYMList;
+  framePDList1, framePDList2, framePDList3: TframePDList;
 
 implementation
 
@@ -231,7 +248,50 @@ begin
 end;
 
 procedure TfrmDyeSimpleTechnicsList.InitGrid();
+var
+  Pwhere: string;
 begin
+
+  Pwhere := SGetFilters(Panel1, 1, 2);
+
+  if trim(char.Text) <> '' then
+  begin
+    if Length(trim(char.Text)) > 1 then
+    begin
+      if Pwhere <> '' then
+        Pwhere := Pwhere + ' and 1=2'
+      else
+        Pwhere := '1=2';
+    end
+    else
+    begin
+      if Pwhere <> '' then
+        Pwhere := Pwhere + ' and DTMNo like ''' + trim(char.Text) + '%-%'' '
+      else
+        Pwhere := 'DTMNo like ''' + trim(char.Text) + '%-%'' ';
+    end;
+  end;
+
+  if trim(Product.Text) <> '' then
+  begin
+    if Pwhere <> '' then
+      Pwhere := Pwhere + ' and DTMNo like ''%' + trim(Product.Text) + '%-%'''
+    else
+      Pwhere := 'DTMNo like ''%' + trim(Product.Text) + '%-%''';
+  end;
+
+  if trim(GYRequire.Text) <> '' then
+  begin
+    if Pwhere <> '' then
+    begin
+      Pwhere := Pwhere + ' and SUBSTRING(DTMNo, 7, 1) = ''' + trim(GYRequire.Text) + '''';
+    end
+    else
+    begin
+      Pwhere := ' SUBSTRING(DTMNo, 7, 1) = ''' + trim(GYRequire.Text) + '''';
+    end;
+  end;
+
   try
     ADOQueryMain.DisableControls;
 
@@ -239,9 +299,13 @@ begin
     begin
       Close;
       SQL.Clear;
-      sql.Add(' select * FROM Dye_Technics_Main');
+      sql.Add(' select * FROM Dye_Technics_Main where 1=1 ');
+      if Pwhere <> '' then
+      begin
+        sql.Add(' and ' + Pwhere);
+      end;
       if cxTabControl1.TabIndex < 2 then
-        sql.Add(' where isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' ');
+        sql.Add(' and isnull(status,''0'')=''' + inttostr(cxTabControl1.TabIndex) + ''' ');
 //      ShowMessage(SQL.Text);
       Open;
 
@@ -484,6 +548,21 @@ begin
         begin
           frameYMList3.SaveData(maxId);
         end;
+      end
+      else if mPSType = '拍打' then
+      begin
+        if CDS_GX.FieldByName('page').AsString = 'framePDList1' then
+        begin
+          framePDList1.SaveData(maxId);
+        end
+        else if CDS_GX.FieldByName('page').AsString = 'framePDList2' then
+        begin
+          framePDList2.SaveData(maxId);
+        end
+        else if CDS_GX.FieldByName('page').AsString = 'framePDList3' then
+        begin
+          framePDList3.SaveData(maxId);
+        end;
       end;
 
       CDS_GX.Next;
@@ -664,6 +743,7 @@ begin
       sql.Add(' select A.* FROM V_Dye_Technics_Details A');
       sql.Add(' Where A.DTMID=''' + trim(CDS_2.fieldbyname('DTMID').AsString) + '''');
       SQL.Add(' ORDER BY A.PSNO');
+//      ShowMessage(sql.Text);
       Open;
     end;
     SCreateCDS(ADOQueryTemp, CDS_GX);
@@ -1196,6 +1276,63 @@ begin
           SCSHData(ADOQueryTemp, frameYMList3.Panel_zm, 2);
           frameYMList3.zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
 
+        end;
+      end
+      else if CDS_GX.FieldByName('PSType').AsString = '拍打' then
+      begin
+        if self.FindComponent('framePDList1') = nil then
+        begin
+          framePDList1 := TframePDList.Create(self);
+          framePDList1.Name := 'framePDList1';
+          framePDList1.Parent := self.ScrollBox1;
+          framePDList1.Top := GetNextFrameTop;
+          framePDList1.Visible := True;
+          framePDList1.LabelPD.Caption := CDS_GX.FieldByName('PSName').AsString;
+          framePDList1.InitGrid();
+
+          CDS_GX.Edit;
+          CDS_GX.FieldByName('page').AsString := 'framePDList1';
+          CDS_GX.Post;
+
+          SCSHData(ADOQueryTemp, framePDList1.Panel_pd, 2);
+//          frameYMList1.zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
+
+        end
+        else if self.FindComponent('framePDList2') = nil then
+        begin
+          framePDList2 := TframePDList.Create(self);
+          framePDList2.Name := 'framePDList2';
+          framePDList2.Parent := self.ScrollBox1;
+          framePDList2.Top := GetNextFrameTop;
+          framePDList2.Visible := True;
+          framePDList2.LabelPD.Caption := CDS_GX.FieldByName('PSName').AsString;
+          framePDList2.InitGrid();
+
+          CDS_GX.Edit;
+          CDS_GX.FieldByName('page').AsString := 'framePDList2';
+          CDS_GX.Post;
+
+          SCSHData(ADOQueryTemp, framePDList2.Panel_pd, 2);
+//          frameYMList2.zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
+
+        end
+        else if self.FindComponent('framePDList3') = nil then
+        begin
+          framePDList3 := TframePDList.Create(self);
+          framePDList3.Name := 'framePDList3';
+          framePDList3.Parent := self.ScrollBox1;
+          framePDList3.Top := GetNextFrameTop;
+          framePDList3.Visible := True;
+          framePDList3.LabelPD.Caption := CDS_GX.FieldByName('PSName').AsString;
+          framePDList3.InitGrid();
+
+          CDS_GX.Edit;
+          CDS_GX.FieldByName('page').AsString := 'framePDList3';
+          CDS_GX.Post;
+
+          SCSHData(ADOQueryTemp, framePDList3.Panel_pd, 2);
+//          frameYMList3.zm_Precautions.Lines.Text := ADOQueryTemp.FieldByName('zm_Precautions').AsString;
+
         end;
       end;
       CDS_GX.Next;
@@ -1283,6 +1420,14 @@ begin
       TFrame(Component).Free;
     end;
   end;
+  for i := 1 to 3 do
+  begin
+    Component := self.FindComponent('framePDList' + IntToStr(i));
+    if Component <> nil then
+    begin
+      TFrame(Component).Free;
+    end;
+  end;
 end;
 
 procedure TfrmDyeSimpleTechnicsList.FormDestroy(Sender: TObject);
@@ -1372,6 +1517,42 @@ begin
   end;
 end;
 
+procedure TfrmDyeSimpleTechnicsList.TbMoveUpClick(Sender: TObject);
+var
+  test: string;
+  ACurrentRow, APrevRow: Integer;
+begin
+  ACurrentRow := Tv3.DataController.FocusedRowIndex + 1;//当前行位置（从1开始）
+  if ACurrentRow = 1 then  // 已经是第一条记录
+    Exit;
+
+  APrevRow := ACurrentRow - 1;
+
+  CDS_GX.DisableControls;
+  try
+    // 交换当前记录和上一条记录的顺序值
+    CDS_GX.RecNo := ACurrentRow;
+    CDS_GX.Edit;
+    CDS_GX.FieldByName('PSNo').AsInteger := APrevRow;
+    test := CDS_GX.FieldByName('PSName').AsString;
+    CDS_GX.Post;
+
+    CDS_GX.RecNo := APrevRow;
+    CDS_GX.Edit;
+    CDS_GX.FieldByName('PSNo').AsInteger := ACurrentRow;
+    test := CDS_GX.FieldByName('PSName').AsString;
+    CDS_GX.Post;
+
+    // 刷新数据
+//    CDS_1.Refresh;
+    CDS_GX.IndexFieldNames := 'PSNo';
+    // 重新定位到移动后的记录
+    Tv3.DataController.FocusedRowIndex := APrevRow - 1;
+  finally
+    CDS_GX.EnableControls;
+  end;
+end;
+
 procedure TfrmDyeSimpleTechnicsList.FormShow(Sender: TObject);
 begin
   inherited;
@@ -1455,6 +1636,212 @@ begin
   InitGXDetails();
 end;
 
+procedure TfrmDyeSimpleTechnicsList.ToolButton7Click(Sender: TObject);
+var
+  test: string;
+  ACurrentRow, APrevRow: Integer;
+begin
+  ACurrentRow := Tv3.DataController.FocusedRowIndex + 1;//当前行位置（从1开始）
+  if ACurrentRow = CDS_GX.RecordCount then  // 已经是第一条记录
+    Exit;
+
+  APrevRow := ACurrentRow + 1;
+
+  CDS_GX.DisableControls;
+  try
+    // 交换当前记录和上一条记录的顺序值
+
+    CDS_GX.RecNo := APrevRow;
+    CDS_GX.Edit;
+    CDS_GX.FieldByName('PSNo').AsInteger := ACurrentRow;
+    test := CDS_GX.FieldByName('PSName').AsString;
+    CDS_GX.Post;
+
+    CDS_GX.RecNo := ACurrentRow;
+    CDS_GX.Edit;
+    CDS_GX.FieldByName('PSNo').AsInteger := APrevRow;
+    test := CDS_GX.FieldByName('PSName').AsString;
+    CDS_GX.Post;
+
+
+
+    // 刷新数据
+//    CDS_1.Refresh;
+    CDS_GX.IndexFieldNames := 'PSNo';
+
+    Tv3.DataController.FocusedRowIndex := ACurrentRow - 1;
+  finally
+    CDS_GX.EnableControls;
+  end;
+end;
+
+procedure TfrmDyeSimpleTechnicsList.TbCopyClick(Sender: TObject);
+var
+  maxNo, maxsubid: string;
+  mMaxDTMID: string;
+  mCopyDTMID: string;
+begin
+
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+  //保存需复制的工艺
+    mCopyDTMID := CDS_2.FieldByName('DTMID').AsString;
+//  fState := '复制';
+    if GetLSNo(ADOQueryCmd, mMaxDTMID, 'GY', 'Dye_Technics_Main', 3, 1) = False then
+      raise Exception.Create('取最大号失败！');
+
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.Clear;
+      sql.Add('select * from Dye_Technics_Main where 1 = 2');
+      Open;
+    end;
+    with ADOQueryCmd do
+    begin
+      Append;
+      FieldByName('Editer').Value := Trim(DName);
+      FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp);
+      FieldByName('DTMID').Value := Trim(mMaxDTMID);
+      Post;
+    end;
+
+    CDS_GX.First;
+    while not CDS_GX.Eof do
+    begin
+
+      if GetLSNo(ADOQueryCmd, maxNo, 'JP', 'Dye_Process', 4, 1) = False then
+      begin
+        Application.MessageBox('取最大号失败！', '提示', 0);
+        Exit;
+      end;
+      with ADOQueryCmd do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add('exec P_CopyDyeProcess ');
+        SQL.Add(' @PSID = ' + QuotedStr(Trim(CDS_GX.fieldbyname('PSID').AsString)));
+        SQL.Add(' ,@maxNo = ' + QuotedStr(Trim(maxNo)));
+        SQL.Add(' ,@DName = ' + QuotedStr(Trim(DName)));
+//        SQL.Add(' ,@DTMID = ' + QuotedStr(Trim(DTMID.Text)));
+        Open;
+      end;
+
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add('SELECT * FROM Dye_Technics_Sub WHERE 1=2');
+        Open;
+      end;
+      with ADOQueryCmd do
+      begin
+        Append;
+        FieldByName('PSNO').Value := Trim(CDS_GX.fieldbyname('PSNO').AsString);
+        FieldByName('DTMID').Value := Trim(mMaxDTMID);
+        FieldByName('PSId').Value := Trim(maxNo);
+        Post;
+      end;
+
+      with ADOQueryCmd do
+      begin
+        Close;
+        SQL.Clear;
+        SQL.Add(' select * from BS_Cloth_GY_Sub where PSID = ' + QuotedStr(Trim(maxNo)));
+        Open;
+      end;
+      ADOQueryCmd.First;
+      while not ADOQueryCmd.Eof do
+      begin
+
+        if ADOQueryCmd.FieldByName('gytype').Value = '长车清洗' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxsubid, 'CCQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then
+          begin
+            Application.MessageBox('取配比子流水号失败！', '提示', 0);
+            Exit;
+          end;
+        end
+        else if ADOQueryCmd.FieldByName('gytype').Value = '卷染缸清洗' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxsubid, 'RGQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then
+          begin
+            Application.MessageBox('取配比子流水号失败！', '提示', 0);
+            Exit;
+          end;
+        end
+        else if ADOQueryCmd.FieldByName('gytype').Value = '机缸清洗' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxsubid, 'JGQX', 'Bs_Cloth_GY_Sub', 5, 1) = False then
+          begin
+            Application.MessageBox('取配比子流水号失败！', '提示', 0);
+            Exit;
+          end;
+        end
+        else if ADOQueryCmd.FieldByName('gytype').Value = '下水定型' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxsubid, 'FS', 'Bs_Cloth_GY_Sub', 5, 1) = False then
+          begin
+            Application.MessageBox('取配比子流水号失败！', '提示', 0);
+            Exit;
+          end;
+        end
+        else if ADOQueryCmd.FieldByName('gytype').Value = '刮胶' then
+        begin
+          if GetLSNo(ADOQueryTemp, maxsubid, 'GJ', 'Bs_Cloth_GY_Sub', 5, 1) = False then
+          begin
+            Application.MessageBox('取配比子流水号失败！', '提示', 0);
+            Exit;
+          end;
+        end
+        else
+        begin
+          if GetLSNo(ADOQueryTemp, maxsubid, 'FP', 'Bs_Cloth_GY_Sub', 5, 1) = False then
+          begin
+            Application.MessageBox('取配比子流水号失败！', '提示', 0);
+            Exit;
+          end;
+        end;
+
+        ADOQueryCmd.Edit;
+        ADOQueryCmd.fieldByName('BCPID').Value := maxsubid;
+        ADOQueryCmd.Post;
+        ADOQueryCmd.Next;
+      end;
+
+      CDS_GX.next;
+    end;
+
+    CDS_2.Append;
+    CDS_2.FieldByName('DTMID').AsString := mMaxDTMID;
+    tv2.Columns[1].Options.Editing := true;
+    tv2.Columns[2].Options.Editing := true;
+
+    with ADOQueryTemp do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add(' select A.* FROM V_Dye_Technics_Details A');
+      sql.Add(' Where A.DTMID=''' + trim(mMaxDTMID) + '''');
+      SQL.Add(' ORDER BY A.PSNO');
+      Open;
+    end;
+    SCreateCDS(ADOQueryTemp, CDS_GX);
+    SInitCDSData(ADOQueryTemp, CDS_GX);
+
+    CloseAllFrames();
+    InitGXDetails();
+
+    ADOQueryCmd.Connection.CommitTrans;
+//    FPSID := maxId;
+
+  except
+
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox('复制失败!', '提示', 0);
+  end;
+end;
+
 procedure TfrmDyeSimpleTechnicsList.Tv1DblClick(Sender: TObject);
 begin
 
@@ -1472,6 +1859,8 @@ end;
 
 procedure TfrmDyeSimpleTechnicsList.Tv2FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
 begin
+//  if fState <> '复制' then
+//  begin
   CloseAllFrames();
   SetStatus();
   InitGlide();
@@ -1496,6 +1885,8 @@ begin
     SCreateCDS(ADOQueryCMD, CDS_PSType);
     SInitCDSData(ADOQueryCMD, CDS_PSType);
   end;
+//  end;
+
 end;
 
 procedure TfrmDyeSimpleTechnicsList.ButtonEdit(Sender: TObject; AButtonIndex: Integer);
@@ -1522,7 +1913,11 @@ end;
 
 procedure TfrmDyeSimpleTechnicsList.DTMNameKeyPress(Sender: TObject; var Key: Char);
 begin
-  ToolButton2.Click;
+  if Key = #13 then
+  begin
+   ToolButton2.Click;
+end;
+
 end;
 
 procedure TfrmDyeSimpleTechnicsList.DTMNoChange(Sender: TObject);
@@ -1532,7 +1927,11 @@ end;
 
 procedure TfrmDyeSimpleTechnicsList.DTMNoKeyPress(Sender: TObject; var Key: Char);
 begin
-  ToolButton2.Click;
+  if Key = #13 then
+  begin
+    ToolButton2.Click;
+  end;
+
 end;
 
 procedure TfrmDyeSimpleTechnicsList.TchkClick(Sender: TObject);
@@ -1673,6 +2072,16 @@ begin
   end;
 end;
 
+procedure TfrmDyeSimpleTechnicsList.CharKeyPress(Sender: TObject; var Key: Char);
+begin
+  if Key = #13 then
+  begin
+    InitGrid();
+
+  end;
+
+end;
+
 procedure TfrmDyeSimpleTechnicsList.ClearAllTextEditsByHint(AParent: TWinControl; const AHint: string; AExclude: TcxTextEdit = nil);
 var
   i: Integer;

F02染色计划单/U_DyeTechnicsList.dfm

@@ -157,7 +157,8 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
     Height = 494
     Align = alLeft
     TabOrder = 2
-    ExplicitLeft = 2
+    ExplicitLeft = -3
+    ExplicitTop = 105
     object Tv2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
@@ -280,8 +281,6 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
     Height = 494
     Align = alClient
     TabOrder = 4
-    ExplicitLeft = 854
-    ExplicitTop = 105
     object TV1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False

F02染色计划单/U_DyeTechnicsinput.dfm

@@ -27,10 +27,11 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput
     object cxGrid2: TcxGrid
       Left = 1
       Top = 39
-      Width = 15
+      Width = 151
       Height = 553
       Align = alClient
       TabOrder = 0
+      ExplicitWidth = 15
       object Tv2: TcxGridDBTableView
         OnDblClick = Tv2DblClick
         Navigator.Buttons.CustomButtons = <>
@@ -114,9 +115,9 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput
       end
     end
     object cxGrid3: TcxGrid
-      Left = -120
+      Left = 152
       Top = 39
-      Width = 432
+      Width = 160
       Height = 553
       Align = alRight
       TabOrder = 2
@@ -175,6 +176,8 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput
       Align = alClient
       PopupMenu = PM_1
       TabOrder = 0
+      ExplicitLeft = 5
+      ExplicitTop = 119
       object TV1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
@@ -322,6 +325,8 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput
       BevelOuter = bvLowered
       Color = clSkyBlue
       TabOrder = 2
+      ExplicitLeft = -4
+      ExplicitTop = 33
       object Label2: TLabel
         Left = 295
         Top = 9

F02染色计划单/U_Dye_AbnormalCardSel.pas

@@ -0,0 +1,193 @@
+unit U_Dye_AbnormalCardSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
+  cxEdit, DB, cxDBData, ToolWin, ComCtrls, U_BaseHelp, cxGridCustomTableView,
+  cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls,
+  cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls,
+  cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
+  cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
+  dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput,
+  dxScrollbarAnnotations, cxDropDownEdit, cxCheckBox, cxCheckComboBox,
+  cxCheckGroup;
+
+type
+  TfrmDye_AbnormalCardSel = class(TfrmBaseHelp)
+    TV1: TcxGridDBTableView;
+    cxGrid1Level1: TcxGridLevel;
+    cxGrid1: TcxGrid;
+    ToolBar1: TToolBar;
+    ADOQueryMain: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    DS_1: TDataSource;
+    CDS_1: TClientDataSet;
+    TBSaveFormat: TToolButton;
+    TBClose: TToolButton;
+    ToolButton1: TToolButton;
+    ADOConnection1: TADOConnection;
+    Panel1: TPanel;
+    Label1: TLabel;
+    DTMNo: TEdit;
+    GPM_1: TcxGridPopupMenu;
+    ImageList1: TImageList;
+    TV1C_Name: TcxGridDBColumn;
+    TV1OrderNo: TcxGridDBColumn;
+    TV1DTMPSlist: TcxGridDBColumn;
+    ThreeColorBase: TcxStyleRepository;
+    SHuangSe: TcxStyle;
+    SkyBlue: TcxStyle;
+    Default: TcxStyle;
+    QHuangSe: TcxStyle;
+    Red: TcxStyle;
+    FontBlue: TcxStyle;
+    TextSHuangSe: TcxStyle;
+    FonePurple: TcxStyle;
+    FoneClMaroon: TcxStyle;
+    FoneRed: TcxStyle;
+    RowColor: TcxStyle;
+    handBlack: TcxStyle;
+    cxBlue: TcxStyle;
+    SHuangSeCu: TcxStyle;
+    Label2: TLabel;
+    DTMName: TEdit;
+    TV1F_Name: TcxGridDBColumn;
+    TV1C_Width: TcxGridDBColumn;
+    TV1C_GramWeight: TcxGridDBColumn;
+    TV1PCPiece: TcxGridDBColumn;
+    TV1PCQty: TcxGridDBColumn;
+    procedure FormCreate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure TBSaveFormatClick(Sender: TObject);
+    procedure TBCloseClick(Sender: TObject);
+    procedure DTMNoChange(Sender: TObject);
+    procedure TV1DblClick(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+  private
+    procedure InitGrid();
+    { Private declarations }
+  public
+    FCoType, FAuthority, FBCIID, fcode, FC_Name: string;
+    { Public declarations }
+  end;
+
+var
+  frmDye_AbnormalCardSel: TfrmDye_AbnormalCardSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun;
+
+{$R *.dfm}
+
+procedure TfrmDye_AbnormalCardSel.FormCreate(Sender: TObject);
+begin
+  inherited;
+  try
+    with ADOConnection1 do
+    begin
+      Connected := false;
+      ConnectionString := DConString;
+      Connected := true;
+    end;
+    ADOQueryBaseCmd.Connection := ADOConnection1;
+    ADOQueryBaseTemp.Connection := ADOConnection1;
+  except
+    application.MessageBox('网络连接失败！', '提示信息');
+  end;
+end;
+
+procedure TfrmDye_AbnormalCardSel.DTMNoChange(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  end;
+
+end;
+
+procedure TfrmDye_AbnormalCardSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+
+  Action := cahide;
+end;
+
+procedure TfrmDye_AbnormalCardSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      sql.Clear;
+//      sql.Add('select A.* from Bs_Cloth_Dye_Technics A where C_Code = ' + QuotedStr(Trim(fCode)));
+      SQL.Add(' select A.KaZu,A.OrderNo,A.C_Name,A.C_Width,A.C_GramWeight,A.DTMPSlist ');
+      SQL.Add(' ,sum(PCPiece) as PCPiece,sum(PCQty) as PCQty ');
+      SQL.Add(' from Dye_Plan_Card A where A.status = ''-1'' ');
+      sql.Add(' group by A.KaZu,A.OrderNo,A.C_Name,A.C_Width,A.C_GramWeight,A.DTMPSlist ');
+      SQL.Add(' ,A.TotalPCIDNum ');
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, CDS_1);
+    SInitCDSData(ADOQueryMain, CDS_1);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmDye_AbnormalCardSel.FormShow(Sender: TObject);
+begin
+  inherited;
+
+  InitGrid();
+
+  ReadCxGrid(self.Caption + 'TV1', TV1, '异常卡组选择');
+  KeyPreview := True;
+end;
+
+procedure TfrmDye_AbnormalCardSel.TBCloseClick(Sender: TObject);
+begin
+  inherited;
+  Close;
+end;
+
+procedure TfrmDye_AbnormalCardSel.TBSaveFormatClick(Sender: TObject);
+begin
+  WriteCxGrid(self.Caption + 'TV1', TV1, '异常卡组选择');
+
+end;
+
+procedure TfrmDye_AbnormalCardSel.ToolButton1Click(Sender: TObject);
+begin
+  if CDS_1.IsEmpty then
+    Exit;
+  ModalResult := 1;
+end;
+
+procedure TfrmDye_AbnormalCardSel.TV1DblClick(Sender: TObject);
+begin
+  if CDS_1.IsEmpty then
+    Exit;
+  ModalResult := 1;
+end;
+
+procedure TfrmDye_AbnormalCardSel.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
+end.
+

F02染色计划单/U_framePDList.dfm

@@ -0,0 +1,106 @@
+object framePDList: TframePDList
+  Left = 0
+  Top = 0
+  Width = 1147
+  Height = 61
+  TabOrder = 0
+  object Panel_pd: TPanel
+    Left = 0
+    Top = 0
+    Width = 1147
+    Height = 61
+    Align = alTop
+    TabOrder = 0
+    object LabelPD: TLabel
+      Left = 4
+      Top = 6
+      Width = 24
+      Height = 12
+      Caption = #25293#25171
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clMenuHighlight
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+    end
+    object cxLabel336: TcxLabel
+      Left = 29
+      Top = 31
+      Caption = #36710#36895
+    end
+    object pd_speed: TcxTextEdit
+      Tag = 2
+      Left = 63
+      Top = 30
+      Style.LookAndFeel.SkinName = 'WXI'
+      StyleDisabled.LookAndFeel.SkinName = 'WXI'
+      StyleFocused.LookAndFeel.SkinName = 'WXI'
+      StyleHot.LookAndFeel.SkinName = 'WXI'
+      TabOrder = 1
+      Width = 70
+    end
+    object cxLabel344: TcxLabel
+      Left = 207
+      Top = 31
+      Caption = #28201#24230
+    end
+    object pd_temperature: TcxTextEdit
+      Tag = 2
+      Left = 241
+      Top = 30
+      Style.LookAndFeel.SkinName = 'WXI'
+      StyleDisabled.LookAndFeel.SkinName = 'WXI'
+      StyleFocused.LookAndFeel.SkinName = 'WXI'
+      StyleHot.LookAndFeel.SkinName = 'WXI'
+      TabOrder = 3
+      Width = 74
+    end
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_DyePlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 187
+    Top = 207
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_DyePlan.ADOLink
+    Parameters = <>
+    Left = 284
+    Top = 206
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_DyePlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 361
+    Top = 207
+  end
+  object CDS_HZ: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 427
+    Top = 193
+  end
+  object DS_HZ: TDataSource
+    DataSet = CDS_HZ
+    Left = 491
+    Top = 212
+  end
+  object cxGridPopupMenu2: TcxGridPopupMenu
+    PopupMenus = <>
+    Left = 520
+    Top = 264
+  end
+  object PopupMenu1: TPopupMenu
+    Left = 146
+    Top = 311
+    object N1: TMenuItem
+      Caption = #20840#36873
+    end
+    object N2: TMenuItem
+      Caption = #20840#24323
+    end
+  end
+end

F02染色计划单/U_framePDList.pas

@@ -0,0 +1,172 @@
+unit U_framePDList;
+
+interface
+
+uses
+  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
+  System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, cxGraphics,
+  cxControls, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit,
+  cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxNavigator,
+  dxDateRanges, dxScrollbarAnnotations, Data.DB, cxDBData, cxCheckBox,
+  cxTextEdit, dxBarBuiltInMenu, Vcl.Menus, cxGridCustomPopupMenu,
+  cxGridPopupMenu, Datasnap.DBClient, Data.Win.ADODB, cxGridLevel,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
+  cxGridCustomView, cxGrid, Vcl.StdCtrls, Vcl.ComCtrls, Vcl.ToolWin,
+  Vcl.ExtCtrls, dxSkinsCore, dxSkinsDefaultPainters, cxMemo, cxLabel,
+  cxMaskEdit, cxDropDownEdit;
+
+type
+  TframePDList = class(TFrame)
+    ADOQueryMain: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    ADOQueryTemp: TADOQuery;
+    CDS_HZ: TClientDataSet;
+    DS_HZ: TDataSource;
+    cxGridPopupMenu2: TcxGridPopupMenu;
+    PopupMenu1: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    Panel_pd: TPanel;
+    LabelPD: TLabel;
+    cxLabel336: TcxLabel;
+    pd_speed: TcxTextEdit;
+    cxLabel344: TcxLabel;
+    pd_temperature: TcxTextEdit;
+    procedure TBRafreshClick(Sender: TObject);
+
+    procedure ToolButton5Click(Sender: TObject);
+
+  private
+
+    { Private declarations }
+  public
+    procedure InitGrid();
+    function SaveData(mPSID : string): Boolean;
+    { Public declarations }
+  end;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_LabelPrint;
+{$R *.dfm}
+
+procedure TframePDList.InitGrid();
+begin
+//  POSNO.SetFocus;
+//  try
+//    ADOQueryMain.DisableControls;
+//    with ADOQueryMain do
+//    begin
+//      Close;
+//      SQL.Clear;
+//      sql.Add(' select A.* from  BS_Position A order by POSNO ');
+//      Open;
+//    end;
+//    SCreateCDS(ADOQueryMain, CDS_HZ);
+//    SInitCDSData(ADOQueryMain, CDS_HZ);
+//  finally
+//    ADOQueryMain.EnableControls;
+//    ToolButton2.Click;
+//  end;
+end;
+
+procedure TframePDList.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+
+
+procedure TframePDList.ToolButton5Click(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    Exit;
+
+  if CDS_HZ.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('请先选择数据！', '提示', 0);
+    Exit;
+  end;
+
+  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+
+  with CDS_HZ do
+  begin
+    while not Eof do
+    begin
+      if CDS_HZ.Locate('SSel', True, []) = True then
+      begin
+        with ADOQueryCmd do
+        begin
+          Close;
+          sql.Clear;
+          sql.Add('delete BS_Position where POSID=' + QuotedStr(CDS_HZ.FieldByName('POSID').AsString));
+          ExecSQL;
+        end;
+      end;
+
+      CDS_HZ.Edit;
+      CDS_HZ.FieldByName('SSel').Value := False;
+      CDS_HZ.Post;
+      Next;
+    end;
+  end;
+  InitGrid();
+end;
+
+
+function TframePDList.SaveData(mPSID : string): Boolean;
+var
+  MaxProcessID, MaxBCPID, MaxPSID, MaxDTMID, mDTMID, DTMPSlist: string;
+  maxsubid1, maxsubid2, maxsubid3, maxsubid4, maxsubid5, maxsubid6, mmaxgx: string;
+begin
+  try
+
+
+////////////////       保存主表      //////////////////////
+      with ADOQueryCmd do
+      begin
+        Close;
+        SQL.Clear;
+        sql.Add('select * from Bs_Cloth_GY_Main where PSID=''' + Trim(mPSID) + '''');
+        Open;
+      end;
+      with ADOQueryCmd do
+      begin
+        if Trim(mPSID) = '' then
+        begin
+          Append;
+        end
+        else
+        begin
+          Edit;
+        end;
+        FieldByName('PSID').Value := Trim(mPSID);
+
+          RTSetsavedata(ADOQueryCmd, 'Bs_Cloth_GY_Main', panel_pd, 2);
+          ADOQueryCmd.Post;
+
+
+
+
+      end;
+////////////////       保存主表结束          //////////////////////
+
+
+
+//    FPSID := maxId;
+    Result := True;
+  except
+    Result := False;
+
+    Application.MessageBox('保存失败!', '提示', 0);
+  end;
+end;
+
+
+
+
+end.
+

F03染色配方管理/Formula.dproj.local

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
@@ -22,13 +22,13 @@
     <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.979,=D:\Dp10Repo\项目代码\红绿蓝\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.756,D:\Dp10Repo\项目代码\RTBasics\F03染色配方管理\Formula.dproj=D:\Dp10Repo\项目代码\RTBasics\F03染色配方管理\InformationBase.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F04染色刷卡/U_DyeOutput.dfm

@@ -3,7 +3,7 @@ inherited frmDyeOutput: TfrmDyeOutput
   ClientHeight = 658
   ClientWidth = 1166
   Font.Height = -16
-  ExplicitLeft = -164
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1182
   ExplicitHeight = 697
   PixelsPerInch = 96
@@ -77,7 +77,6 @@ inherited frmDyeOutput: TfrmDyeOutput
     Font.Style = [fsBold]
     ParentFont = False
     TabOrder = 1
-    ExplicitTop = 79
     object Label2: TLabel
       Left = 48
       Top = 20

F04染色刷卡/U_DyeOutput.pas

@@ -107,6 +107,7 @@ type
     procedure Edit17Click(Sender: TObject);
     procedure Button1Click(Sender: TObject);
     procedure Timer1Timer(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     fGlideName, fSCunit, fJPUnit: string;
     procedure InitCar(fPCID: string);
@@ -234,6 +235,15 @@ begin
   frmDyeOutput := nil;
 end;
 
+procedure TfrmDyeOutput.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeOutput.FormCreate(Sender: TObject);
 begin
   inherited;
@@ -596,6 +606,7 @@ procedure TfrmDyeOutput.FormShow(Sender: TObject);
 begin
   inherited;
   Scan.OnClick(Scan);
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 end.

F04染色刷卡/U_DyeOutputList.dfm

@@ -8,6 +8,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
   Font.Name = 'Tahoma'
   OldCreateOrder = True
   WindowState = wsMaximized
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1161
   ExplicitHeight = 623
   PixelsPerInch = 96
@@ -323,7 +324,6 @@ inherited frmDyeOutputList: TfrmDyeOutputList
     Height = 482
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 97
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

F04染色刷卡/U_DyeOutputList.pas

@@ -96,6 +96,7 @@ type
     procedure Button1Click(Sender: TObject);
     procedure Button2Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     FLeft, FTop: Integer;
     procedure InitGrid();
@@ -121,6 +122,16 @@ begin
   frmDyeOutputList := nil;
 end;
 
+procedure TfrmDyeOutputList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeOutputList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -276,6 +287,7 @@ begin
   canshu1 := self.fParameters1;
 
   initgrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyeOutputList.TBExportClick(Sender: TObject);

F04染色刷卡/U_DyePCDetailsList.dfm

@@ -1,16 +1,16 @@
 inherited frmDyePCDetailsList: TfrmDyePCDetailsList
   Caption = #25490#20135#20449#24687#26126#32454
   ClientHeight = 584
-  ClientWidth = 1396
+  ClientWidth = 1439
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Height = -11
   Font.Name = 'Tahoma'
+  KeyPreview = True
   OldCreateOrder = True
   WindowState = wsMaximized
   OnKeyDown = FormKeyDown
-  ExplicitLeft = -315
+  ExplicitWidth = 1455
-  ExplicitWidth = 1412
   ExplicitHeight = 623
   PixelsPerInch = 96
   TextHeight = 13
@@ -18,11 +18,11 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1396
+    Width = 1439
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 97
+    ButtonWidth = 109
     Caption = 'ToolBar1'
     Color = clSkyBlue
     DisabledImages = DataLink_DyeProcess.ImageList_new32
@@ -37,7 +37,6 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     ParentFont = False
     ShowCaptions = True
     TabOrder = 0
-    ExplicitWidth = 1216
     object TBRafresh: TToolButton
       Left = 0
       Top = 0
@@ -102,18 +101,26 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       ImageIndex = 7
       OnClick = TBCloseClick
     end
+    object ToolButton2: TToolButton
+      Left = 670
+      Top = 0
+      AutoSize = True
+      Caption = 'ToolButton2'
+      ImageIndex = 8
+      Visible = False
+      OnClick = ToolButton2Click
+    end
   end
   object Panel1: TPanel [1]
     Left = 0
     Top = 38
-    Width = 1396
+    Width = 1439
-    Height = 83
+    Height = 99
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
-    ExplicitLeft = -1
     object Label3: TLabel
       Left = 260
       Top = 10
@@ -164,7 +171,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Caption = #35774#22791
     end
     object Label5: TLabel
-      Left = 1016
+      Left = 982
       Top = 6
       Width = 24
       Height = 13
@@ -205,19 +212,18 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBCCQX1: TSpeedButton
       Tag = 1
-      Left = 9
+      Left = 122
-      Top = 57
+      Top = 69
       Width = 50
       Height = 20
       GroupIndex = 1
-      Down = True
       Caption = #28165#27927'1'
       OnClick = SBCCQX1Click
     end
     object SBDX3: TSpeedButton
       Tag = 5
-      Left = 233
+      Left = 607
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -226,8 +232,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBDX2: TSpeedButton
       Tag = 4
-      Left = 177
+      Left = 553
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -236,8 +242,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBDX1: TSpeedButton
       Tag = 3
-      Left = 121
+      Left = 499
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -246,8 +252,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBJG1: TSpeedButton
       Tag = 8
-      Left = 458
+      Left = 392
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -256,8 +262,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBDX6: TSpeedButton
       Tag = 8
-      Left = 402
+      Left = 769
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -266,8 +272,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBDX5: TSpeedButton
       Tag = 7
-      Left = 346
+      Left = 715
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -276,8 +282,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBDX4: TSpeedButton
       Tag = 6
-      Left = 290
+      Left = 661
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -286,8 +292,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBJRG1: TSpeedButton
       Tag = 10
-      Left = 515
+      Left = 230
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -296,8 +302,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBJRG3: TSpeedButton
       Tag = 12
-      Left = 627
+      Left = 338
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -306,18 +312,19 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBZM1: TSpeedButton
       Tag = 13
-      Left = 684
+      Left = 14
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
+      Down = True
       Caption = #36711#27611'1'
       OnClick = SBCCQX1Click
     end
     object SBJRG2: TSpeedButton
       Tag = 11
-      Left = 571
+      Left = 284
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -325,9 +332,9 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnClick = SBCCQX1Click
     end
     object SBZM2: TSpeedButton
-      Tag = 13
+      Tag = 14
-      Left = 740
+      Left = 68
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -336,8 +343,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBCCQX2: TSpeedButton
       Tag = 2
-      Left = 65
+      Left = 176
-      Top = 57
+      Top = 69
       Width = 50
       Height = 20
       GroupIndex = 1
@@ -346,8 +353,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     end
     object SBPD1: TSpeedButton
       Tag = 15
-      Left = 796
+      Left = 445
-      Top = 57
+      Top = 69
       Width = 50
       Height = 22
       GroupIndex = 1
@@ -435,7 +442,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
         end>
       Properties.OnButtonClick = MCNOPropertiesButtonClick
       TabOrder = 8
-      Text = #38271#36710#28165#27927#26426'1'
+      Text = #36711#27611#21333#25490#38024'1'
       Width = 120
     end
     object MCName: TEdit
@@ -444,11 +451,11 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Width = 121
       Height = 21
       TabOrder = 9
-      Text = 'CCQX1'
+      Text = 'ZM1'
       Visible = False
     end
     object cbALL_temperature6: TCheckBox
-      Left = 1056
+      Left = 1022
       Top = 6
       Width = 65
       Height = 17
@@ -457,7 +464,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnClick = cbALL_temperature6Click
     end
     object cbAll_zhuji: TCheckBox
-      Left = 1056
+      Left = 1022
       Top = 29
       Width = 65
       Height = 17
@@ -466,8 +473,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       OnClick = cbALL_temperature6Click
     end
     object cxComboBox1: TcxComboBox
-      Left = 886
+      Left = 672
-      Top = 25
+      Top = 33
       Properties.Items.Strings = (
         #20840#37096
         #26410#25490#20135
@@ -478,11 +485,12 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Properties.OnChange = cxComboBox1PropertiesChange
       TabOrder = 12
       Text = #20840#37096
+      Visible = False
       Width = 121
     end
     object cbTime: TCheckBox
-      Left = 1056
+      Left = 1022
-      Top = 52
+      Top = 54
       Width = 65
       Height = 17
       Caption = #24635#29992#26102
@@ -507,41 +515,112 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       TabOrder = 15
       OnKeyPress = pcidKeyPress
     end
-    object Panel4: TPanel
+    object cbPC0: TCheckBox
-      Left = 1127
+      Left = 896
       Top = 6
+      Width = 65
+      Height = 17
+      Caption = #26410#25490#20135
+      Checked = True
+      Color = 13421823
+      ParentColor = False
+      State = cbChecked
+      TabOrder = 16
+      OnClick = cbPC0Click
+    end
+    object cbPC1: TCheckBox
+      Left = 896
+      Top = 29
+      Width = 65
+      Height = 17
+      Caption = #24050#25490#20135
+      Checked = True
+      Color = clWhite
+      ParentColor = False
+      State = cbChecked
+      TabOrder = 17
+      OnClick = cbPC0Click
+    end
+    object cbBG: TCheckBox
+      Left = 896
+      Top = 77
+      Width = 65
+      Height = 17
+      Caption = #24050#25253#24037
+      Checked = True
+      Color = 14737632
+      ParentColor = False
+      State = cbChecked
+      TabOrder = 18
+      OnClick = cbPC0Click
+    end
+    object cbSC: TCheckBox
+      Left = 896
+      Top = 52
+      Width = 65
+      Height = 17
+      Caption = #29983#20135#20013
+      Checked = True
+      Color = 11597232
+      ParentColor = False
+      State = cbChecked
+      TabOrder = 19
+      OnClick = cbPC0Click
+    end
+    object Panel4: TPanel
+      Left = 1111
+      Top = 9
       Width = 60
       Height = 25
       Caption = #26410#25490#20135
       Color = 13421823
       Font.Charset = ANSI_CHARSET
       Font.Color = clWindowText
-      Font.Height = -16
+      Font.Height = -12
       Font.Name = #24494#36719#38597#40657
       Font.Style = []
       ParentBackground = False
       ParentFont = False
-      TabOrder = 16
+      TabOrder = 20
     end
     object Panel5: TPanel
-      Left = 1193
+      Left = 1177
-      Top = 6
+      Top = 9
       Width = 60
       Height = 25
-      Caption = #25490#20135#26410#25253#24037
+      Caption = #24050#25490#20135
       Color = clWindow
       ParentBackground = False
-      TabOrder = 17
+      TabOrder = 21
     end
     object Panel6: TPanel
-      Left = 1259
+      Left = 1111
-      Top = 6
+      Top = 40
-      Width = 67
+      Width = 60
       Height = 25
-      Caption = #24050#19978#26426#26410#19979#26426
+      Caption = #29983#20135#20013
+      Color = 11597232
+      ParentBackground = False
+      TabOrder = 22
+    end
+    object Panel7: TPanel
+      Left = 1177
+      Top = 40
+      Width = 60
+      Height = 25
+      Caption = #24050#25253#24037
       Color = 14737632
       ParentBackground = False
-      TabOrder = 18
+      TabOrder = 23
+    end
+    object cbGlideName: TCheckBox
+      Left = 1022
+      Top = 77
+      Width = 65
+      Height = 17
+      Caption = #24037#24207#21517#31216
+      TabOrder = 24
+      OnClick = cbALL_temperature6Click
     end
   end
   object MovePanel2: TMovePanel [2]
@@ -563,22 +642,20 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
   end
   object Panel2: TPanel [3]
     Left = 0
-    Top = 121
+    Top = 137
-    Width = 1396
+    Width = 1439
-    Height = 463
+    Height = 447
     Align = alClient
     TabOrder = 3
-    ExplicitWidth = 1216
     object cxGrid1: TcxGrid
       Left = 1
       Top = 1
       Width = 736
-      Height = 461
+      Height = 445
       Align = alLeft
+      PopupMenu = PM_1
       TabOrder = 0
-      ExplicitTop = 0
       object Tv1: TcxGridDBTableView
-        OnKeyDown = Tv1KeyDown
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
         OnCustomDrawCell = Tv1CustomDrawCell
@@ -610,6 +687,13 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           HeaderAlignmentHorz = taCenter
           Width = 90
         end
+        object Tv1GlideNo: TcxGridDBColumn
+          Caption = #24037#24207#32534#21495
+          DataBinding.FieldName = 'GlideNo'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
         object Tv1PSName: TcxGridDBColumn
           Caption = #24037#24207#21517#31216
           DataBinding.FieldName = 'GlideName'
@@ -686,13 +770,6 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           HeaderAlignmentHorz = taCenter
           Width = 80
         end
-        object Tv1CGlideNo: TcxGridDBColumn
-          DataBinding.FieldName = 'GlideNo'
-          DataBinding.IsNullValueType = True
-          Visible = False
-          HeaderAlignmentHorz = taCenter
-          Width = 80
-        end
       end
       object cxGrid1Level1: TcxGridLevel
         GridView = Tv1
@@ -701,13 +778,12 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     object cxGrid2: TcxGrid
       Left = 824
       Top = 1
-      Width = 571
+      Width = 614
-      Height = 461
+      Height = 445
       Align = alClient
+      PopupMenu = PM_2
       TabOrder = 1
-      ExplicitTop = 2
       object Tv2: TcxGridDBTableView
-        OnKeyDown = Tv2KeyDown
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
         OnCellClick = Tv2CellClick
@@ -716,7 +792,6 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
         DataController.Summary.DefaultGroupSummaryItems = <>
         DataController.Summary.FooterSummaryItems = <>
         DataController.Summary.SummaryGroups = <>
-        OptionsData.Editing = False
         OptionsView.GroupByBox = False
         Styles.Selection = DataLink_DyeProcess.SHuangSe
         object cxGridDBColumn1: TcxGridDBColumn
@@ -724,6 +799,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           DataBinding.FieldName = 'PCID'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 90
         end
         object cxGridDBColumn2: TcxGridDBColumn
@@ -731,6 +807,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           DataBinding.FieldName = 'OrderNo'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 90
         end
         object cxGridDBColumn3: TcxGridDBColumn
@@ -738,13 +815,22 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           DataBinding.FieldName = 'C_Name'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 90
         end
+        object Tv2GlideNo: TcxGridDBColumn
+          Caption = #24037#24207#32534#21495
+          DataBinding.FieldName = 'GlideNo'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
         object cxGridDBColumn4: TcxGridDBColumn
           Caption = #24037#24207#21517#31216
           DataBinding.FieldName = 'GlideName'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 90
         end
         object cxGridDBColumn5: TcxGridDBColumn
@@ -752,6 +838,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           DataBinding.FieldName = 'ALL_temperature6'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 90
         end
         object Tv2CAll_zhuji: TcxGridDBColumn
@@ -759,6 +846,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           DataBinding.FieldName = 'All_zhuji'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 100
         end
         object Tv2All_rate: TcxGridDBColumn
@@ -766,6 +854,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           DataBinding.FieldName = 'All_rate'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 80
         end
         object cxGridDBColumn6: TcxGridDBColumn
@@ -773,6 +862,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           DataBinding.FieldName = 'PCQty'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 90
         end
         object cxGridDBColumn7: TcxGridDBColumn
@@ -780,6 +870,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           DataBinding.FieldName = 'time'
           DataBinding.IsNullValueType = True
           HeaderAlignmentHorz = taCenter
+          Options.Editing = False
           Width = 90
         end
         object Tv2PC_FLAG: TcxGridDBColumn
@@ -791,8 +882,8 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           Width = 90
         end
         object Tv2isComplete: TcxGridDBColumn
-          Caption = #25253#24037
+          Caption = #29983#20135
-          DataBinding.FieldName = 'isComplete'
+          DataBinding.FieldName = 'Complete'
           DataBinding.IsNullValueType = True
           Visible = False
           HeaderAlignmentHorz = taCenter
@@ -805,11 +896,19 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           HeaderAlignmentHorz = taCenter
           Width = 80
         end
-        object Tv2GlideNo: TcxGridDBColumn
+        object Tv2BG: TcxGridDBColumn
-          DataBinding.FieldName = 'GlideNo'
+          Caption = #25253#24037
+          DataBinding.FieldName = 'BG'
           DataBinding.IsNullValueType = True
           Visible = False
           HeaderAlignmentHorz = taCenter
+          Width = 65
+        end
+        object Tv2MCNo: TcxGridDBColumn
+          Caption = #24050#25490#26426#21488
+          DataBinding.FieldName = 'MCNo'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
           Width = 80
         end
       end
@@ -821,7 +920,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Left = 737
       Top = 1
       Width = 87
-      Height = 461
+      Height = 445
       Align = alLeft
       TabOrder = 2
       object cxButton1: TcxButton
@@ -955,4 +1054,20 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
     Left = 696
     Top = 176
   end
+  object PM_1: TPopupMenu
+    Left = 320
+    Top = 273
+    object N1: TMenuItem
+      Caption = #22797#21046
+      OnClick = N1Click
+    end
+  end
+  object PM_2: TPopupMenu
+    Left = 560
+    Top = 401
+    object N2: TMenuItem
+      Caption = #22797#21046
+      OnClick = N2Click
+    end
+  end
 end

F04染色刷卡/U_DyePCDetailsList.pas

@@ -5,7 +5,7 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage,
-  cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView,
+  cxEdit, DB, cxDBData, cxGridCustomTableView, cxGridTableView, Clipbrd,
   cxGridBandedTableView, cxGridDBBandedTableView, cxGridLevel, cxClasses,
   cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls,
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
@@ -13,7 +13,7 @@ uses
   RM_Class, RM_GridReport, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
   dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu,
   U_BaseList, dxScrollbarAnnotations, cxContainer, cxTextEdit, cxMaskEdit,
-  Vcl.Menus, cxButtons, Vcl.Buttons;
+  Vcl.Menus, cxButtons, Vcl.Buttons, cxCheckBox;
 
 type
   TfrmDyePCDetailsList = class(TfrmBaseList)
@@ -84,7 +84,7 @@ type
     Tv1GlideID: TcxGridDBColumn;
     Tv2GlideID: TcxGridDBColumn;
     Tv1IsConflict: TcxGridDBColumn;
-    Tv1CGlideNo: TcxGridDBColumn;
+    Tv1GlideNo: TcxGridDBColumn;
     Tv2GlideNo: TcxGridDBColumn;
     Panel3: TPanel;
     cxButton1: TcxButton;
@@ -121,9 +121,22 @@ type
     SBZM2: TSpeedButton;
     SBCCQX2: TSpeedButton;
     SBPD1: TSpeedButton;
+    cbPC0: TCheckBox;
+    cbPC1: TCheckBox;
+    cbBG: TCheckBox;
+    cbSC: TCheckBox;
+    Tv2BG: TcxGridDBColumn;
+    PM_1: TPopupMenu;
+    PM_2: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
     Panel4: TPanel;
     Panel5: TPanel;
     Panel6: TPanel;
+    Panel7: TPanel;
+    ToolButton2: TToolButton;
+    cbGlideName: TCheckBox;
+    Tv2MCNo: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -141,8 +154,7 @@ type
     procedure TbUpdateTimeClick(Sender: TObject);
     procedure MCNOPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure Tv2KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+
-    procedure Tv1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure cxButton1Click(Sender: TObject);
     procedure Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
     procedure cxButton2Click(Sender: TObject);
@@ -155,6 +167,10 @@ type
     procedure TbEditClick(Sender: TObject);
     procedure pcidKeyPress(Sender: TObject; var Key: Char);
     procedure SBCCQX1Click(Sender: TObject);
+    procedure cbPC0Click(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+    procedure N2Click(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
 
   private
     FLeft, FTop: Integer;
@@ -166,6 +182,11 @@ type
     function GetNextTenMinutes(ACurrentTime: TDateTime): TDateTime;
 
     function BuildOrderBySQL: string;
+
+    procedure CheckFocusLocation;
+    procedure AppIdleSetFocus(Sender: TObject; var Done: Boolean);
+    procedure AutoCloseMessage(const Msg: string; CloseTime: Integer = 2000);
+    procedure TimerCloseForm(Sender: TObject);
     { Private declarations }
   public
     fsyrName, canshu1: string;
@@ -185,6 +206,36 @@ uses
 
 {$R *.dfm}
 
+procedure TfrmDyePCDetailsList.CheckFocusLocation;
+var
+  ActiveForm: TCustomForm;
+  FocusedControl: TWinControl;
+begin
+  // 1. 获取当前活动窗体
+  ActiveForm := Screen.ActiveForm;
+  if Assigned(ActiveForm) then
+    ShowMessage('当前活动窗体: ' + ActiveForm.Name)
+  else
+    ShowMessage('没有活动窗体');
+
+  // 2. 获取当前拥有焦点的控件
+  FocusedControl := Screen.ActiveControl;
+  if Assigned(FocusedControl) then
+  begin
+    ShowMessage('焦点控件: ' + FocusedControl.Name + #13#10'所属窗体: ' + (FocusedControl.Parent as TCustomForm).Name);
+  end
+  else
+    ShowMessage('没有控件获得焦点');
+
+  // 3. 检查本窗体是否拥有焦点
+  if Self.Focused then
+    ShowMessage('本窗体拥有焦点')
+  else if Assigned(Self.ActiveControl) then
+    ShowMessage('本窗体的焦点控件: ' + Self.ActiveControl.Name)
+  else
+    ShowMessage('本窗体没有焦点');
+end;
+
 procedure TfrmDyePCDetailsList.FormDestroy(Sender: TObject);
 begin
   inherited;
@@ -201,37 +252,35 @@ begin
         Close;
       end;
 
-    VK_LEFT:
+    VK_LEFT, Ord('A'), Ord('a'):
       begin
       // 向左移动的逻辑
-        ShowMessage('左');
+//        ShowMessage('左');
         cxButton1.Click;
         Key := 0;  // 阻止后续处理
       end;
 
-    VK_RIGHT:
+    VK_RIGHT, Ord('D'), Ord('d'):
       begin
       // 向右移动的逻辑
         cxButton2.Click;
         Key := 0;
       end;
 
-    VK_UP:
+    VK_UP, Ord('W'), Ord('w'):
       begin
       // 向上移动的逻辑
         TbMoveUp.Click;
         Key := 0;
       end;
 
-    VK_DOWN:
+    VK_DOWN, Ord('S'), Ord('s'):
       begin
       // 向下移动的逻辑
         TbMoveDown.Click;
         Key := 0;
       end;
-
   end;
-
 end;
 
 function TfrmDyePCDetailsList.SaveData(): boolean;
@@ -595,95 +644,95 @@ begin
   begin
     case (Sender as TSpeedButton).Tag of  // 用Tag区分不同按钮
       1:
-      begin
+        begin
-        MCNO.Text := '长车清洗机1';
+          MCNO.Text := '长车清洗机1';
-        MCName.Text := 'CCQX1';
+          MCName.Text := 'CCQX1';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       2:
-      begin
+        begin
-        MCNO.Text := '长车清洗机2';
+          MCNO.Text := '长车清洗机2';
-        MCName.Text := 'CCQX2';
+          MCName.Text := 'CCQX2';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       3:
-      begin
+        begin
-        MCNO.Text := '定型机1';
+          MCNO.Text := '定型机1';
-        MCName.Text := 'DX1';
+          MCName.Text := 'DX1';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       4:
-      begin
+        begin
-        MCNO.Text := '定型机2';
+          MCNO.Text := '定型机2';
-        MCName.Text := 'DX2';
+          MCName.Text := 'DX2';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       5:
-      begin
+        begin
-        MCNO.Text := '定型机3';
+          MCNO.Text := '定型机3';
-        MCName.Text := 'DX3';
+          MCName.Text := 'DX3';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       6:
-      begin
+        begin
-        MCNO.Text := '定型机4';
+          MCNO.Text := '定型机4';
-        MCName.Text := 'DX4';
+          MCName.Text := 'DX4';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       7:
-      begin
+        begin
-         MCNO.Text := '定型机5';
+          MCNO.Text := '定型机5';
-        MCName.Text := 'DX5';
+          MCName.Text := 'DX5';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       8:
-      begin
+        begin
-        MCNO.Text := '定型机6';
+          MCNO.Text := '定型机6';
-        MCName.Text := 'DX6';
+          MCName.Text := 'DX6';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       9:
-      begin
+        begin
-        MCNO.Text := '机缸1';
+          MCNO.Text := '机缸1';
-        MCName.Text := 'JG1';
+          MCName.Text := 'JG1';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       10:
-      begin
+        begin
-        MCNO.Text := '卷染缸1';
+          MCNO.Text := '卷染缸1';
-        MCName.Text := 'JRG1';
+          MCName.Text := 'JRG1';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       11:
-      begin
+        begin
-        MCNO.Text := '卷染缸2';
+          MCNO.Text := '卷染缸2';
-        MCName.Text := 'JRG2';
+          MCName.Text := 'JRG2';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       12:
-      begin
+        begin
-        MCNO.Text := '卷染缸3';
+          MCNO.Text := '卷染缸3';
-        MCName.Text := 'JRG3';
+          MCName.Text := 'JRG3';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       13:
-      begin
+        begin
-        MCNO.Text := '轧毛单排针1';
+          MCNO.Text := '轧毛单排针1';
-        MCName.Text := 'ZM1';
+          MCName.Text := 'ZM1';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       14:
-      begin
+        begin
-        MCNO.Text := '轧毛双排针1';
+          MCNO.Text := '轧毛双排针2';
-        MCName.Text := 'ZM2';
+          MCName.Text := 'ZM2';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
       15:
-      begin
+        begin
-        MCNO.Text := '拍打机1';
+          MCNO.Text := '拍打机1';
-        MCName.Text := 'PD1';
+          MCName.Text := 'PD1';
-        InitGrid1();
+          InitGrid1();
-      end;
+        end;
     end;
   end;
 
@@ -725,7 +774,7 @@ begin
     Application.MessageBox('工序已排产！', '提示信息', MB_OK);
     exit;
   end
-  else if not CDS_2.FieldByName('isComplete').IsNull then
+  else if CDS_2.FieldByName('BG').asString = '1' then
   begin
     Application.MessageBox('工序已报工！', '提示信息', MB_OK);
     exit;
@@ -926,7 +975,7 @@ begin
       begin
         Close;
         SQL.Clear;
-        SQL.Add(' update Dye_Plan_Glide set PC_FLAG = 0,IsConflict = 0,endTime = null,begTime = null where GlideID = ' + QuotedStr(Trim(CDS_1.FieldByName('GlideID').asString)));
+        SQL.Add(' update Dye_Plan_Glide set PC_FLAG = 0,IsConflict = 0,endTime = null,begTime = null,MCNO = null,MCName = null where GlideID = ' + QuotedStr(Trim(CDS_1.FieldByName('GlideID').asString)));
         ExecSQL;
       end;
 /////////////////////////////检查时间冲突/////////////////////
@@ -1074,6 +1123,7 @@ begin
     tv1.EndUpdate;
    // tv1.ApplyBestFit();
   end;
+
 end;
 
 procedure TfrmDyePCDetailsList.InitGrid2();
@@ -1083,25 +1133,109 @@ var
   rs: _Recordset;
   r: integer;
   msql1: string;
+  CheckBox: TCheckBox;
 begin
   // 任务时间
-
   try
     tv1.BeginUpdate;
     ADOQueryMain.DisableControls;
 
-    if cxComboBox1.Text = '未排产' then
+    if cbPC0.Checked then
-      msql1 := 'and PC_FLAG = 0'
+    begin
-    else if cxComboBox1.Text = '排产未报工' then
+      if msql1 = '' then
-      msql1 := 'and isComplete is null and PC_FLAG = 1'
+      begin
-    else if cxComboBox1.Text = '已报工' then
+        msql1 := ' (PC_FLAG = 0) ';
-      msql1 := 'and isComplete is not null'
+      end
-    else if cxComboBox1.Text = '报工未完成' then
+      else
-      msql1 := 'and isComplete = 0'
+      begin
-//    else if cxComboBox1.Text = '已完成' then
+        msql1 := msql1 + ' or (PC_FLAG = 0) ';
-//      msql1 := 'and isComplete = 1'
+      end;
-    else
+//      msql1 := msql1 + ' or (PC_FLAG = 0) ';
-      msql1 := '';
+    end;
+//    else
+//    begin
+//      if msql1 = '' then
+//      begin
+//        msql1 := ' (PC_FLAG <> 0) ';
+//      end
+//      else
+//      begin
+//        msql1 := msql1 + ' and (PC_FLAG <> 0) ';
+//      end;
+//    end;
+
+    if cbPC1.Checked then
+    begin
+      if msql1 = '' then
+      begin
+        msql1 := ' (PC_FLAG = 1) ';
+      end
+      else
+      begin
+        msql1 := msql1 + ' or (PC_FLAG = 1) ';
+      end;
+//      msql1 := msql1 + ' or (PC_FLAG = 1) ';
+    end;
+//    else
+//    begin
+//      if msql1 = '' then
+//      begin
+//        msql1 := ' (PC_FLAG <> 1) ';
+//      end
+//      else
+//      begin
+//        msql1 := msql1 + ' and (PC_FLAG <> 1) ';
+//      end;
+//    end;
+
+    if cbSC.Checked then
+    begin
+      if msql1 = '' then
+      begin
+        msql1 := ' (Complete > 0) ';
+      end
+      else
+      begin
+        msql1 := msql1 + ' or (Complete > 0) ';
+      end;
+//      msql1 := msql1 + ' or (Complete > 0) ';
+    end;
+//    else
+//    begin
+//      if msql1 = '' then
+//      begin
+//        msql1 := ' (Complete <> 1) ';
+//      end
+//      else
+//      begin
+//        msql1 := msql1 + ' and (Complete <> 1) ';
+//      end;
+//    end;
+
+    if cbBG.Checked then
+    begin
+      if msql1 = '' then
+      begin
+        msql1 := ' (BG = 1)';
+      end
+      else
+      begin
+        msql1 := msql1 + ' or (BG = 1)';
+      end;
+//      msql1 := msql1 + ' or (BG = 1)';
+    end;
+//    else
+//    begin
+//      if msql1 = '' then
+//      begin
+//        msql1 := ' (BG <> 1) ';
+//      end
+//      else
+//      begin
+//        msql1 := msql1 + ' and (BG <> 1) ';
+//      end;
+//    end;
+
 
     fsql2 := BuildOrderBySQL;
     with ADOQueryMain do
@@ -1109,15 +1243,26 @@ begin
       close;
       filtered := false;
       sql.Clear;
-      SQL.Add(' select A.* from V_Dye_Cloth_PaiGang A where 1=1 ' + msql1);
+      SQL.Add(' select A.* from V_Dye_Cloth_PaiGang A where 1=1  ');
-      sql.Add(' AND  EXISTS ( SELECT * from Dye_Plan_Card X where X.KaZu = A.PCID and X.Status = ''10'') ');
+      sql.Add(' AND  A.KaZuState = 9 ');
+      if msql1 <> '' then
+      begin
+        sql.Add(' and ( ' + msql1 + ' )');
+      end;
+
       SQL.Add(fsql2);
-      //      ShowMessage(sql.Text);
+//            ShowMessage(sql.Text);
       Open;
 
     end;
+    if Tv2.DataController.Filter.FilterText <> '' then
+    begin
+      SDofilter(ADOQueryMain, Tv2.DataController.Filter.FilterText);
+    end;
+
     SCreateCDS(ADOQueryMain, CDS_2);
     SInitCDSData(ADOQueryMain, CDS_2);
+
   finally
     ADOQueryMain.EnableControls;
     tv1.EndUpdate;
@@ -1142,6 +1287,8 @@ begin
     FieldName := 'All_zhuji'
   else if CheckBox = cbTime then
     FieldName := 'Time'
+  else if CheckBox = cbGlideName then
+    FieldName := 'GlideName'
   else
     Exit;
 
@@ -1186,6 +1333,12 @@ begin
   InitGrid2();
 end;
 
+procedure TfrmDyePCDetailsList.cbPC0Click(Sender: TObject);
+begin
+  InitGrid2();
+
+end;
+
 // 构建排序SQL（使用动态数组版本）
 function TfrmDyePCDetailsList.BuildOrderBySQL: string;
 var
@@ -1230,6 +1383,17 @@ begin
   end;
 end;
 
+procedure TfrmDyePCDetailsList.N1Click(Sender: TObject);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(CDS_1.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+
+end;
+
+procedure TfrmDyePCDetailsList.N2Click(Sender: TObject);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(CDS_2.fieldbyname(TV2.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+end;
+
 procedure TfrmDyePCDetailsList.TBRafreshClick(Sender: TObject);
 begin
   MovePanel2.Visible := True;
@@ -1276,6 +1440,11 @@ begin
   WriteCxGrid(self.Caption + tv2.Name, Tv2, '排产信息明细');
 end;
 
+procedure TfrmDyePCDetailsList.ToolButton2Click(Sender: TObject);
+begin
+  CheckFocusLocation();
+end;
+
 procedure TfrmDyePCDetailsList.Tv1BegTimePropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
 var
   Begtime: TDateTime;
@@ -1320,19 +1489,12 @@ begin
   // 获取字段值
   mIsConflict := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('IsConflict').Index];
 
-  if AViewInfo.GridRecord.Selected then
-  begin
-    ADone := False;  // 让控件继续使用默认的选中样式
-    Exit;
-  end;
-
-
   // 设置不同状态的颜色和字体
   if mIsConflict = 1 then               // 未排入计划单
   begin
     ACanvas.Brush.Color := clRed;  // 红色背景
     ACanvas.Font.Color := clWindowText;
-    ACanvas.Font.Style := [fsBold];
+    ACanvas.Font.Style := [];
   end
   else  // 默认情况
   begin
@@ -1340,44 +1502,15 @@ begin
     ACanvas.Font.Color := clWindowText;
     ACanvas.Font.Style := [];
   end;
+  if AViewInfo.GridRecord.Selected then
+  begin
 
-  // 如果需要自定义绘制完成，取消下面的注释
+    ACanvas.Font.Color := $000080FF;
-  // ADone := True;
+    ACanvas.Font.Style := [fsBold];
-end;
-
-procedure TfrmDyePCDetailsList.Tv1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-begin
-  case Key of
-    VK_LEFT:
-      begin
-      // 左方向键被按下
-        ShowMessage('左方向键');
-      // 执行向左移动的代码
-      end;
-
-    VK_RIGHT:
-      begin
-      // 右方向键被按下
-        ShowMessage('右方向键');
-      // 执行向右移动的代码
-      end;
-
-    VK_UP:
-      begin
-      // 上方向键被按下
-        ShowMessage('上方向键');
-      // 执行向上移动的代码
-      end;
-
-    VK_DOWN:
-      begin
-      // 下方向键被按下
-        ShowMessage('下方向键');
-      // 执行向下移动的代码
-      end;
 
   end;
-
+  // 如果需要自定义绘制完成，取消下面的注释
+  // ADone := True;
 end;
 
 procedure TfrmDyePCDetailsList.Tv2CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
@@ -1388,43 +1521,41 @@ end;
 
 procedure TfrmDyePCDetailsList.Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
-  PC_FLAG, isComplete: Variant;
+  PC_FLAG, Complete, BG: Variant;
 begin
   // 获取字段值
   PC_FLAG := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('PC_FLAG').Index];
-  isComplete := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('isComplete').Index];
+  Complete := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('Complete').Index];
-
+  BG := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('BG').Index];
-  if AViewInfo.GridRecord.Selected then
+//  if AViewInfo.GridRecord.Selected then
-  begin
+//  begin
-    ADone := False;  // 让控件继续使用默认的选中样式
+//    ADone := False;  // 让控件继续使用默认的选中样式
-    Exit;
+//    Exit;
-  end;
+//  end;
-
 
   // 设置不同状态的颜色和字体
-//  if (not VarIsNull(isComplete)) and (isComplete = true) then // 成品入库
+  if (BG = 1) then // 报工未点完成
-//  begin
-//    ACanvas.Brush.Color := $00E0FFE0;    // 浅绿色背景
-//    ACanvas.Font.Color := $00008000;
-//    ACanvas.Font.Style := [fsBold];
-//  end
-//  else
-  if (not VarIsNull(isComplete))  then // 生产一部分       and (isComplete = False)
   begin
     ACanvas.Brush.Color := $00E0E0E0;    // 浅灰色背景
-    ACanvas.Font.Color := clGray;
+    ACanvas.Font.Color := clWindowText;
-    ACanvas.Font.Style := [fsBold];      //
+    ACanvas.Font.Style := [];
   end
-  else if VarIsNull(PC_FLAG) or (PC_FLAG = 0) then               // 未排入计划单
+  else if (Complete > 0) then // 生产中
   begin
-    ACanvas.Brush.Color := $00CCCCFF;  // 浅红色背景
+    ACanvas.Brush.Color := $00E0FFE0;    // 浅绿色背景
-    ACanvas.Font.Color := clRed;
+    ACanvas.Font.Color := clWindowText;
-    ACanvas.Font.Style := [fsBold];
+    ACanvas.Font.Style := [];      //
   end
-  else if (PC_FLAG = 1) and VarIsNull(isComplete) then      // 排入未报工
+  else if (PC_FLAG = 1) then      // 已排产
   begin
     ACanvas.Brush.Color := clWindow;     // 默认窗口背景色
-    ACanvas.Font.Color := clWindowText;  // 默认窗口文本色
+    ACanvas.Font.Color := clWindowText;
+    ACanvas.Font.Style := [];
+  end
+  else if (PC_FLAG = 0) then               // 未排产
+  begin
+    ACanvas.Brush.Color := $00CCCCFF;  // 浅红色背景
+    ACanvas.Font.Color := clWindowText;
     ACanvas.Font.Style := [];
   end
   else  // 默认情况
@@ -1434,44 +1565,15 @@ begin
     ACanvas.Font.Style := [];
   end;
 
-  // 如果需要自定义绘制完成，取消下面的注释
+  if AViewInfo.GridRecord.Selected then
-  // ADone := True;
+  begin
-end;
+    ACanvas.Font.Color := $000080FF;
-
+    ACanvas.Font.Style := [fsBold];
-procedure TfrmDyePCDetailsList.Tv2KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-begin
-  case Key of
-
-    VK_LEFT:
-      begin
-      // 左方向键被按下
-        ShowMessage('左方向键');
-      // 执行向左移动的代码
-      end;
-
-    VK_RIGHT:
-      begin
-      // 右方向键被按下
-        ShowMessage('右方向键');
-      // 执行向右移动的代码
-      end;
-
-    VK_UP:
-      begin
-      // 上方向键被按下
-        ShowMessage('上方向键');
-      // 执行向上移动的代码
-      end;
-
-    VK_DOWN:
-      begin
-      // 下方向键被按下
-        ShowMessage('下方向键');
-      // 执行向下移动的代码
-      end;
-
   end;
 
+
+  // 如果需要自定义绘制完成，取消下面的注释
+  // ADone := True;
 end;
 
 procedure TfrmDyePCDetailsList.ConNoMChange(Sender: TObject);
@@ -1484,13 +1586,15 @@ end;
 
 procedure TfrmDyePCDetailsList.TBCloseClick(Sender: TObject);
 begin
-
   Close;
 end;
 
 procedure TfrmDyePCDetailsList.FormShow(Sender: TObject);
 begin
+  KeyPreview := True;
+//  ShowMessage(BoolToStr(KeyPreview));
   inherited;
+//
   ReadCxGrid(self.Caption + tv1.Name, Tv1, '排产信息明细');
   ReadCxGrid(self.Caption + tv2.Name, Tv2, '排产信息明细');
   canshu1 := self.fParameters1;
@@ -1502,9 +1606,83 @@ begin
   EndDate.Date := Trunc(ServerDate) + 1;  // 后一天
   Begtime.Time := EncodeTime(0, 0, 0, 0);   // 早上8点
   endTime.Time := EncodeTime(0, 0, 0, 0);  // 晚上6点
-  initgrid1();
+  InitGrid1();
-  initgrid2();
+  InitGrid2();
-  KeyPreview := True;
+
+  // 在应用程序空闲时设置焦点（确保所有初始化完成）
+  Application.OnIdle := AppIdleSetFocus;
+
+//  CheckFocusLocation();
+//  ShowMessage(BoolToStr(KeyPreview));
+end;
+
+procedure TfrmDyePCDetailsList.AutoCloseMessage(const Msg: string; CloseTime: Integer = 2000);
+var
+  Form: TForm;
+  Label1: TLabel;
+  Timer: TTimer;
+begin
+  Form := TForm.Create(nil);
+  try
+    Form.BorderStyle := bsDialog;
+    Form.Caption := '提示';
+    Form.Position := poScreenCenter;
+    Form.Width := 300;
+    Form.Height := 120;
+
+    Label1 := TLabel.Create(Form);
+    Label1.Parent := Form;
+    Label1.Caption := Msg + #13#10 + IntToStr(CloseTime div 1000) + '秒后自动关闭...';
+    Label1.Align := alClient;
+    Label1.Alignment := taCenter;
+    Label1.Layout := tlCenter;
+    Label1.WordWrap := True;
+
+    Timer := TTimer.Create(Form);
+    Timer.Interval := CloseTime;
+    Timer.OnTimer := TimerCloseForm;  // 使用独立的方法
+
+    // 需要存储 Form 引用以便在事件中访问
+    Tag := Integer(Form);  // 使用 Tag 存储引用
+
+    Form.ShowModal;
+  finally
+    Form.Free;
+  end;
+end;
+
+// 独立的计时器事件处理方法
+procedure TfrmDyePCDetailsList.TimerCloseForm(Sender: TObject);
+var
+  Form: TForm;
+begin
+  // 从 Sender 获取 Timer
+  TTimer(Sender).Enabled := False;
+
+  // 获取关联的 Form
+  Form := TForm(TTimer(Sender).Owner);
+  if Assigned(Form) then
+    Form.ModalResult := mrOk;
+end;
+
+procedure TfrmDyePCDetailsList.AppIdleSetFocus(Sender: TObject; var Done: Boolean);
+begin
+  // 确保只执行一次
+  Application.OnIdle := nil;
+
+  // 将焦点设置到本窗体
+  if Self.CanFocus then
+  begin
+    Self.SetFocus;
+//     可选：输出调试信息
+
+    AutoCloseMessage('操作成功！', 1000); // 1秒后自动关闭
+
+//     ShowMessage('焦点已设置到窗体: ' + Self.Name);
+
+  end;
+
+  Done := True; // 保持默认处理流程
 end;
 
 procedure TfrmDyePCDetailsList.TBExportClick(Sender: TObject);

F04染色刷卡/U_DyePCList.dfm

@@ -9,7 +9,6 @@ inherited frmDyePCList: TfrmDyePCList
   OldCreateOrder = True
   WindowState = wsMaximized
   OnKeyDown = FormKeyDown
-  ExplicitLeft = -312
   ExplicitWidth = 1196
   ExplicitHeight = 623
   PixelsPerInch = 96
@@ -261,8 +260,6 @@ inherited frmDyePCList: TfrmDyePCList
     TabOrder = 3
     LookAndFeel.ScrollbarMode = sbmHybrid
     LookAndFeel.ScrollMode = scmDefault
-    ExplicitLeft = -40
-    ExplicitTop = 89
     object tv1: TcxGridDBTableView
       Tag = 9999
       DragMode = dmAutomatic
@@ -465,14 +462,29 @@ inherited frmDyePCList: TfrmDyePCList
         DataBinding.FieldName = 'ZM1'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1ZM1StylesGetContentStyle
         Width = 61
+        OnCompareRowValuesForCellMerging = tv1ZM1CompareRowValuesForCellMerging
       end
       object tv1ZM2: TcxGridDBColumn
         Caption = #36711#27611#26426'2'
         DataBinding.FieldName = 'ZM2'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.CellMerging = True
+        Styles.OnGetContentStyle = tv1ZM2StylesGetContentStyle
         Width = 60
+        OnCompareRowValuesForCellMerging = tv1ZM2CompareRowValuesForCellMerging
+      end
+      object tv1PD1: TcxGridDBColumn
+        Caption = #25293#25171#26426'1'
+        DataBinding.FieldName = 'PD1'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Styles.OnGetContentStyle = tv1PD1StylesGetContentStyle
+        Width = 80
+        OnCompareRowValuesForCellMerging = tv1PD1CompareRowValuesForCellMerging
       end
     end
     object dbGrid1Level1: TcxGridLevel

F04染色刷卡/U_DyePCList.pas

@@ -72,6 +72,7 @@ type
     tv1ZM1: TcxGridDBColumn;
     tv1ZM2: TcxGridDBColumn;
     TbUpdateTime: TToolButton;
+    tv1PD1: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -112,6 +113,30 @@ type
     procedure tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
     procedure TbUpdateTimeClick(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure tv1ZM1StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1ZM2StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1ZM1CompareRowValuesForCellMerging(Sender: TcxGridColumn;
+      ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties;
+      const AValue1: Variant; ARow2: TcxGridDataRow;
+      AProperties2: TcxCustomEditProperties; const AValue2: Variant;
+      var AAreEqual: Boolean);
+    procedure tv1ZM2CompareRowValuesForCellMerging(Sender: TcxGridColumn;
+      ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties;
+      const AValue1: Variant; ARow2: TcxGridDataRow;
+      AProperties2: TcxCustomEditProperties; const AValue2: Variant;
+      var AAreEqual: Boolean);
+    procedure tv1PD1StylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      var AStyle: TcxStyle);
+    procedure tv1PD1CompareRowValuesForCellMerging(Sender: TcxGridColumn;
+      ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties;
+      const AValue1: Variant; ARow2: TcxGridDataRow;
+      AProperties2: TcxCustomEditProperties; const AValue2: Variant;
+      var AAreEqual: Boolean);
 
   private
     FLeft, FTop: Integer;
@@ -735,6 +760,135 @@ begin
   end;
 end;
 
+procedure TfrmDyePCList.tv1PD1CompareRowValuesForCellMerging(
+  Sender: TcxGridColumn; ARow1: TcxGridDataRow;
+  AProperties1: TcxCustomEditProperties; const AValue1: Variant;
+  ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties;
+  const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1PD1.Index] = ARow2.Values[tv1PD1.Index]) and (ARow1.Values[tv1PD1.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1PD1StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1PD1.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0:
+          AStyle.Color := $00CCFFFF;  // 淡黄色
+        1:
+          AStyle.Color := $00CCFFCC;  // 淡绿色
+        2:
+          AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1ZM1CompareRowValuesForCellMerging(
+  Sender: TcxGridColumn; ARow1: TcxGridDataRow;
+  AProperties1: TcxCustomEditProperties; const AValue1: Variant;
+  ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties;
+  const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1ZM1.Index] = ARow2.Values[tv1ZM1.Index]) and (ARow1.Values[tv1ZM1.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1ZM1StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1ZM1.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0:
+          AStyle.Color := $00CCFFFF;  // 淡黄色
+        1:
+          AStyle.Color := $00CCFFCC;  // 淡绿色
+        2:
+          AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
+procedure TfrmDyePCList.tv1ZM2CompareRowValuesForCellMerging(
+  Sender: TcxGridColumn; ARow1: TcxGridDataRow;
+  AProperties1: TcxCustomEditProperties; const AValue1: Variant;
+  ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties;
+  const AValue2: Variant; var AAreEqual: Boolean);
+begin
+  if (ARow1.Values[tv1ZM2.Index] = ARow2.Values[tv1ZM2.Index]) and (ARow1.Values[tv1ZM2.Index] <> NULL) then
+    AAreEqual := True
+  else
+    AAreEqual := False;
+end;
+
+procedure TfrmDyePCList.tv1ZM2StylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; var AStyle: TcxStyle);
+var
+  GroupValue: string;
+  ColorValue: Integer;
+  I: Integer;
+begin
+  if (ARecord <> nil) and (ARecord is TcxGridDataRow) then
+  begin
+    GroupValue := VarToStr(ARecord.Values[tv1ZM2.Index]);
+
+    if (GroupValue <> '') and (GroupValue <> null) then
+    begin
+      // 基于每个字符的位置和值计算哈希
+
+      ColorValue := StrToInt(Copy(GroupValue, Length(GroupValue), 1));
+      AStyle := TcxStyle.Create(nil);
+      case ColorValue mod 3 of
+        0:
+          AStyle.Color := $00CCFFFF;  // 淡黄色
+        1:
+          AStyle.Color := $00CCFFCC;  // 淡绿色
+        2:
+          AStyle.Color := $00FFCCCC;  // 淡蓝色
+      end;
+      AStyle.TextColor := clBlack;
+    end;
+  end;
+end;
+
 procedure TfrmDyePCList.ConNoMChange(Sender: TObject);
 begin
   if ADOQueryMain.Active then

F04染色刷卡/U_MachTaskList.dfm

@@ -13,6 +13,7 @@ object frmMachTaskList: TfrmMachTaskList
   OldCreateOrder = False
   WindowState = wsMaximized
   OnCreate = FormCreate
+  OnKeyDown = FormKeyDown
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 21
@@ -195,7 +196,7 @@ object frmMachTaskList: TfrmMachTaskList
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 114
+    ButtonWidth = 137
     Caption = 'ToolBar1'
     GradientEndColor = clWindow
     Images = DataLink_DyeProcess.ImageList_new32
@@ -212,7 +213,7 @@ object frmMachTaskList: TfrmMachTaskList
       OnClick = TrefreshClick
     end
     object ToolButton1: TToolButton
-      Left = 71
+      Left = 79
       Top = 0
       AutoSize = True
       Caption = #19978#31227
@@ -221,7 +222,7 @@ object frmMachTaskList: TfrmMachTaskList
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
-      Left = 142
+      Left = 158
       Top = 0
       AutoSize = True
       Caption = #19979#31227
@@ -230,7 +231,7 @@ object frmMachTaskList: TfrmMachTaskList
       OnClick = ToolButton2Click
     end
     object TbSave: TToolButton
-      Left = 213
+      Left = 237
       Top = 0
       AutoSize = True
       Caption = #20445#23384
@@ -238,7 +239,7 @@ object frmMachTaskList: TfrmMachTaskList
       OnClick = TbSaveClick
     end
     object TbEditSave: TToolButton
-      Left = 284
+      Left = 316
       Top = 0
       AutoSize = True
       Caption = #20462#25913#20445#23384
@@ -246,7 +247,7 @@ object frmMachTaskList: TfrmMachTaskList
       OnClick = TbEditSaveClick
     end
     object TBDel: TToolButton
-      Left = 379
+      Left = 427
       Top = 0
       AutoSize = True
       Caption = #21024#38500#20445#23384
@@ -254,7 +255,7 @@ object frmMachTaskList: TfrmMachTaskList
       OnClick = TBDelClick
     end
     object Tconfirm: TToolButton
-      Left = 474
+      Left = 538
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -262,7 +263,7 @@ object frmMachTaskList: TfrmMachTaskList
       OnClick = TconfirmClick
     end
     object Tclose: TToolButton
-      Left = 569
+      Left = 649
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -270,17 +271,19 @@ object frmMachTaskList: TfrmMachTaskList
       OnClick = TcloseClick
     end
     object ToolButton3: TToolButton
-      Left = 640
+      Left = 728
       Top = 0
       Caption = 'ToolButton3'
       ImageIndex = 8
+      Visible = False
       OnClick = ToolButton3Click
     end
     object ToolButton4: TToolButton
-      Left = 754
+      Left = 865
       Top = 0
       Caption = 'ToolButton4'
       ImageIndex = 9
+      Visible = False
       OnClick = ToolButton4Click
     end
   end
@@ -293,7 +296,6 @@ object frmMachTaskList: TfrmMachTaskList
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 2
-    ExplicitTop = 32
     object Label1: TLabel
       Left = 24
       Top = 18
@@ -349,8 +351,8 @@ object frmMachTaskList: TfrmMachTaskList
       Width = 155
     end
     object Panel2: TPanel
-      Left = 968
+      Left = 942
-      Top = 6
+      Top = 17
       Width = 60
       Height = 25
       Caption = #26410#25490#20135
@@ -365,31 +367,31 @@ object frmMachTaskList: TfrmMachTaskList
       TabOrder = 2
     end
     object Panel3: TPanel
-      Left = 1048
+      Left = 1071
-      Top = 6
+      Top = 17
-      Width = 105
+      Width = 60
       Height = 25
-      Caption = #25490#20837#26410#25253#24037
+      Caption = #24050#25490#20135
       Color = clWindow
       ParentBackground = False
       TabOrder = 3
     end
     object Panel4: TPanel
-      Left = 1184
+      Left = 1199
-      Top = 6
+      Top = 17
-      Width = 105
+      Width = 60
       Height = 25
-      Caption = #29983#20135#19968#37096#20998
+      Caption = #29983#20135#20013
       Color = 14737632
       ParentBackground = False
       TabOrder = 4
     end
     object Panel5: TPanel
       Left = 1328
-      Top = 6
+      Top = 17
-      Width = 129
+      Width = 60
       Height = 25
-      Caption = #25104#21697#24050#20837#24211
+      Caption = #24050#25253#24037
       Color = 14745568
       ParentBackground = False
       TabOrder = 5

F04染色刷卡/U_MachTaskList.pas

@@ -100,6 +100,7 @@ type
     procedure Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
     procedure ToolButton3Click(Sender: TObject);
     procedure ToolButton4Click(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
 
   private
     procedure initGrid();
@@ -127,6 +128,16 @@ begin
   cxgrid1.Align := alClient;
 end;
 
+procedure TfrmMachTaskList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmMachTaskList.TBDelClick(Sender: TObject);
 begin
   if MessageDlg('确定删除？此操作无法撤销！', mtWarning, [mbOK, mbCancel], 0) = mrOK then
@@ -830,6 +841,8 @@ begin
     TbEditSave.Visible := false;
     TbDel.Visible := False;
   end;
+
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmMachTaskList.initGrid();
@@ -911,8 +924,9 @@ begin
     begin
       close;
       sql.Clear;
-      sql.Add('select * from V_Dye_Cloth_PaiGang ');
+      SQL.Add(' select A.* from V_Dye_Cloth_PaiGang A where 1=1  ');
-      sql.Add('where isComplete <> 1 OR isComplete IS NULL order by PCID ASC, GlideNo ASC');
+      sql.Add(' AND  A.KaZuState = 9 ');
+//      sql.Add('where isComplete <> 1 OR isComplete IS NULL order by PCID ASC, GlideNo ASC');
 //      ShowMessage(SQL.Text);
 //      a.taskDate,
       open;

F05染色检验/DyeInsp.dproj.local

@@ -26,13 +26,13 @@
     <Transaction>1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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>2025/10/30 16:43:17.000.471,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F05染色检验\U_DyeCardRoll.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">

F05染色检验/DyeInspLogin.dproj.local

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="DbPanel"/>
-    <File Path="DbPanel\MovePanel.pas"/>
-    <File Path="delphitwain"/>
-    <File Path="delphitwain\DelphiTwain.pas"/>
-    <File Path="delphitwain\DelphiTwainUtils.pas"/>
-    <File Path="delphitwain\Twain.pas"/>
-    <File Path="AES.pas"/>
-    <File Path="ElAES.pas"/>
-    <File Path="JDAESExtend.pas"/>
     <File Path="logon.pas"/>
     <File Path="logon.dfm"/>
     <File Path="spmain.pas"/>
     <File Path="spmain.dfm"/>
-    <File Path="U_iniParam.pas"/>
+    <File Path="delphitwain"/>
-    <File Path="U_Link.pas"/>
+    <File Path="delphitwain\DelphiTwain.pas"/>
-    <File Path="U_Link.dfm"/>
+    <File Path="delphitwain\DelphiTwainUtils.pas"/>
+    <File Path="delphitwain\Twain.pas"/>
+    <File Path="DbPanel"/>
+    <File Path="DbPanel\MovePanel.pas"/>
+    <File Path="AES.pas"/>
+    <File Path="ElAES.pas"/>
     <File Path="U_upPassword.pas"/>
     <File Path="U_upPassword.dfm"/>
+    <File Path="U_Link.pas"/>
+    <File Path="U_Link.dfm"/>
+    <File Path="U_iniParam.pas"/>
+    <File Path="JDAESExtend.pas"/>
   </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj</Transaction>
   </Transactions>
 </BorlandProject>

F05染色检验/U_DyeCardRoll.dfm

@@ -2,6 +2,7 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
   Caption = #22823#21367#26729#31649#29702
   ClientHeight = 699
   ClientWidth = 1401
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1417
   ExplicitHeight = 738
   PixelsPerInch = 96
@@ -45,17 +46,33 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
       ImageIndex = 0
       OnClick = TBFindClick
     end
-    object TBPrint: TToolButton
+    object TbEditMeter: TToolButton
       Left = 142
       Top = 0
       AutoSize = True
+      Caption = #20462#25913#31859#25968
+      ImageIndex = 3
+      OnClick = TbEditMeterClick
+    end
+    object ToolButton3: TToolButton
+      Left = 237
+      Top = 0
+      AutoSize = True
+      Caption = #21024#38500
+      ImageIndex = 9
+      OnClick = ToolButton3Click
+    end
+    object TBPrint: TToolButton
+      Left = 308
+      Top = 0
+      AutoSize = True
       Caption = #25171#21360
       ImageIndex = 21
       Visible = False
       OnClick = TBPrintClick
     end
     object TBExport: TToolButton
-      Left = 213
+      Left = 379
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -63,7 +80,7 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
       OnClick = TBExportClick
     end
     object ToolButton2: TToolButton
-      Left = 284
+      Left = 450
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -71,7 +88,7 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
       OnClick = ToolButton2Click
     end
     object TBClose: TToolButton
-      Left = 379
+      Left = 545
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -89,7 +106,6 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
-    ExplicitTop = 32
     object Label1: TLabel
       Left = 18
       Top = 17
@@ -104,7 +120,7 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
       ParentFont = False
     end
     object Label3: TLabel
-      Left = 223
+      Left = 366
       Top = 17
       Width = 52
       Height = 12
@@ -117,32 +133,6 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
       ParentFont = False
       OnDblClick = Label3DblClick
     end
-    object Label8: TLabel
-      Left = 404
-      Top = 17
-      Width = 39
-      Height = 12
-      Caption = #21367#26729#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-    end
-    object Label11: TLabel
-      Left = 404
-      Top = 43
-      Width = 52
-      Height = 12
-      Caption = #27969#31243#21345#21495
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-    end
     object Label12: TLabel
       Left = 613
       Top = 119
@@ -157,11 +147,11 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
       ParentFont = False
     end
     object Label2: TLabel
-      Left = 223
+      Left = 190
-      Top = 43
+      Top = 17
-      Width = 39
+      Width = 52
       Height = 12
-      Caption = #21345#32452#21495
+      Caption = #27969#31243#21345#32452
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12
@@ -170,7 +160,7 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
       ParentFont = False
     end
     object Label4: TLabel
-      Left = 588
+      Left = 543
       Top = 17
       Width = 52
       Height = 12
@@ -182,25 +172,12 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
       Font.Style = [fsBold]
       ParentFont = False
     end
-    object Label5: TLabel
+    object Label6: TLabel
-      Left = 588
+      Left = 724
-      Top = 43
+      Top = 17
       Width = 52
       Height = 12
-      Caption = #24037#24207#21517#31216
+      Caption = #24037#24207#32534#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 = 773
-      Top = 17
-      Width = 26
-      Height = 12
-      Caption = #24037#24207
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12
@@ -230,74 +207,71 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
     end
     object OrderNo: TEdit
       Tag = 2
-      Left = 281
+      Left = 421
       Top = 13
       Width = 100
       Height = 20
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
       TabOrder = 2
       OnChange = OrderNoChange
     end
-    object RollNumber: TEdit
-      Tag = 2
-      Left = 462
-      Top = 13
-      Width = 100
-      Height = 20
-      TabOrder = 3
-      OnChange = OrderNoChange
-    end
-    object PCID: TEdit
-      Tag = 2
-      Left = 462
-      Top = 39
-      Width = 100
-      Height = 20
-      TabOrder = 4
-      OnChange = OrderNoChange
-    end
     object MPRTKZ: TEdit
       Tag = 2
       Left = 654
       Top = 99
       Width = 56
       Height = 20
-      TabOrder = 5
+      TabOrder = 3
       OnChange = OrderNoChange
     end
     object KaZu: TEdit
       Tag = 2
-      Left = 281
+      Left = 246
-      Top = 39
+      Top = 13
       Width = 100
       Height = 20
-      TabOrder = 6
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 4
       OnChange = OrderNoChange
     end
     object C_Name: TEdit
       Tag = 2
-      Left = 646
+      Left = 601
       Top = 13
       Width = 100
       Height = 20
-      TabOrder = 7
+      Font.Charset = GB2312_CHARSET
-      OnChange = OrderNoChange
+      Font.Color = clWindowText
-    end
+      Font.Height = -12
-    object GlideName: TEdit
+      Font.Name = #23435#20307
-      Tag = 2
+      Font.Style = []
-      Left = 646
+      ParentFont = False
-      Top = 39
+      TabOrder = 5
-      Width = 100
-      Height = 20
-      TabOrder = 8
       OnChange = OrderNoChange
     end
     object GlideNo: TEdit
       Tag = 2
-      Left = 805
+      Left = 780
       Top = 13
       Width = 100
       Height = 20
-      TabOrder = 9
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 6
       OnChange = OrderNoChange
     end
   end
@@ -309,7 +283,6 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 2
-    ExplicitTop = 131
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -552,32 +525,32 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll
     Connection = DataLink_DyeInsp.ADOLink
     Parameters = <>
     Left = 672
-    Top = 188
+    Top = 194
   end
   object ADOQueryMain: TADOQuery
     Connection = DataLink_DyeInsp.ADOLink
     LockType = ltReadOnly
     Parameters = <>
     Left = 504
-    Top = 192
+    Top = 198
   end
   object ADOQueryTemp: TADOQuery
     Connection = DataLink_DyeInsp.ADOLink
     LockType = ltReadOnly
     Parameters = <>
     Left = 580
-    Top = 184
+    Top = 190
   end
   object DataSource1: TDataSource
     DataSet = Order_Main
     Left = 592
-    Top = 288
+    Top = 294
   end
   object Order_Main: TClientDataSet
     Aggregates = <>
     Params = <>
     Left = 440
-    Top = 308
+    Top = 314
   end
   object PM_1: TPopupMenu
     Left = 272

F05染色检验/U_DyeCardRoll.pas

@@ -42,10 +42,6 @@ type
     Order_Main: TClientDataSet;
     PM_1: TPopupMenu;
     N2: TMenuItem;
-    Label8: TLabel;
-    RollNumber: TEdit;
-    Label11: TLabel;
-    PCID: TEdit;
     Label12: TLabel;
     MPRTKZ: TEdit;
     DS_2: TDataSource;
@@ -84,11 +80,11 @@ type
     KaZu: TEdit;
     Label4: TLabel;
     C_Name: TEdit;
-    Label5: TLabel;
-    GlideName: TEdit;
     Tv1Column1: TcxGridDBColumn;
     Label6: TLabel;
     GlideNo: TEdit;
+    TbEditMeter: TToolButton;
+    ToolButton3: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -108,6 +104,9 @@ type
     procedure cxTabControl1Change(Sender: TObject);
     procedure Label3DblClick(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
+    procedure ToolButton3Click(Sender: TObject);
+    procedure TbEditMeterClick(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
 
   private
     DQdate: TDateTime;
@@ -150,9 +149,6 @@ end;
 procedure TfrmDyeCardRoll.SetStatus();
 begin
 
-
-
-
   if Trim(canshu1) = '¹ÜÀí' then
   begin
 
@@ -160,12 +156,10 @@ begin
       0:
         begin
 
-
         end;
       1:
         begin
 
-
         end;
       2:
         begin
@@ -185,7 +179,6 @@ begin
       0:
         begin
 
-
         end;
       1:
         begin
@@ -237,11 +230,54 @@ begin
   FWorkshop := trim(Self.fParameters3);
 end;
 
+procedure TfrmDyeCardRoll.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeCardRoll.TBCloseClick(Sender: TObject);
 begin
   Close;
 end;
 
+procedure TfrmDyeCardRoll.TbEditMeterClick(Sender: TObject);
+var
+  InputStr: string;
+  MID: string;
+begin
+  if not Order_Main.IsEmpty then
+    MID := Trim(Order_Main.FieldByName('ID').AsString)
+  else
+    MID := '';
+// 最后尝试定位回原记录
+
+
+
+  // 弹出输入框
+  InputStr := InputBox('编辑米数', '请输入新的米数:', '');
+
+  if InputStr <> '' then  // 如果用户输入了内容
+  begin
+    // 处理输入的值
+    with ADOQueryCmd do
+    begin
+      Close;
+      sql.clear;
+      sql.Add(' update Dye_ClothCardRoll set RollMeter = ' + QuotedStr(Trim(InputStr)));
+      sql.add(' where ID = ' + Order_Main.FieldByName('ID').AsString);
+      ExecSQL;
+    end;
+  end;
+  InitGrid();
+  if MID <> '' then
+    Order_Main.Locate('ID', MID, []);
+end;
+
 procedure TfrmDyeCardRoll.InitGrid();
 begin
 
@@ -283,7 +319,7 @@ begin
 ////      sql.Add(' and A.Workshop=''' + trim(FWorkshop) + ''' ');
 //      if Trim(canshu1) = '¼Èë' then
 //        sql.Add('and Filler=' + QuotedStr(Trim(DName)));
-       sql.Add(' order By KaZu ,GlideNo');
+      sql.Add(' order By KaZu ,GlideNo');
 ////      ShowMessage(sql.Text);
 ///
 ///
@@ -307,8 +343,6 @@ begin
   SInitCDSData(ADOQueryMain, Order_Main);
 end;
 
-
-
 function TfrmDyeCardRoll.DelData(): Boolean;
 begin
   try
@@ -397,6 +431,7 @@ begin
 
   SetStatus();
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyeCardRoll.CheckBox1Click(Sender: TObject);
@@ -467,9 +502,54 @@ begin
   WriteCxGrid(self.Caption + 'TV1', Tv1, '´ó¾í×®¹ÜÀí');
 end;
 
+procedure TfrmDyeCardRoll.ToolButton3Click(Sender: TObject);
+begin
+  if Order_Main.Locate('ssel', true, []) = False then
+  begin
+    Application.MessageBox('请选择数据', '提示信息', MB_OK);
+    Exit;
+  end;
 
+  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  try
+    with Order_Main do
+    begin
+      DisableControls;
+      First;
+      while not Eof do
+      begin
+        if Fieldbyname('Ssel').AsBoolean then
+        begin
+          try
+            ADOQueryCmd.Connection.BeginTrans;
 
+            with ADOQueryCmd do
+            begin
+              Close;
+              Sql.Clear;
+              Sql.Add('delete from Dye_ClothCardRoll where ID = ' + quotedstr(Trim(Order_Main.fieldbyname('ID').AsString)));
+              ExecSQL;
+            end;
 
+            ADOQueryCmd.Connection.CommitTrans;
+          except
+            ADOQueryCmd.Connection.RollbackTrans;
+            raise Exception.Create(PChar(Exception(ExceptObject).Message));
+          end;
+        end;
+
+        Next;
+      end;
+      EnableControls;
+    end;
+
+    TBRafresh.Click;
+  except
+    Order_Main.EnableControls;
+    application.MessageBox(PChar(Exception(ExceptObject).Message), '提示信息', 0);
+  end;
+end;
 
 procedure TfrmDyeCardRoll.cxTabControl1Change(Sender: TObject);
 begin

F05染色检验/U_DyeClothInspList.dfm

@@ -7,6 +7,7 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1487
   ExplicitHeight = 621
   PixelsPerInch = 96

F05染色检验/U_DyeClothInspList.pas

@@ -124,6 +124,7 @@ type
     procedure N2Click(Sender: TObject);
     procedure N3Click(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     DQdate: TDateTime;
     FLeft, FTop: Integer;
@@ -174,6 +175,16 @@ begin
   FWorkshop := trim(Self.fParameters3);
 end;
 
+procedure TfrmDyeClothInspList.FormKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeClothInspList.TBCloseClick(Sender: TObject);
 begin
   Close;
@@ -285,6 +296,7 @@ begin
   InitGrid();
   SetStatus();
   InitGrid();
+  KeyPreview := True;  // 确保表单可以预览按键
 end;
 
 procedure TfrmDyeClothInspList.Tv1MouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
@@ -553,6 +565,16 @@ end;
 procedure TfrmDyeClothInspList.ToolButton2Click(Sender: TObject);
 begin
   try
+    with ADOQueryCmd do
+    begin
+      close;
+      sql.Clear;
+      sql.Add('exec P_OrderCR');
+
+//      ShowMessage(sql.Text);
+      execsql;
+    end;
+
     with ADOQueryCmd do
     begin
       Close;

F05染色检验/U_DyeClothInspStaffOutputList.dfm

@@ -3,6 +3,7 @@ inherited frmDyeClothInspStaffOutputList: TfrmDyeClothInspStaffOutputList
   Caption = #25171#21367#21592#24037#20135#37327#20449#24687'              '
   ClientHeight = 715
   ClientWidth = 1477
+  OnKeyDown = FormKeyDown
   ExplicitWidth = 1493
   ExplicitHeight = 754
   PixelsPerInch = 96

F05染色检验/U_DyeClothInspStaffOutputList.pas

@@ -87,6 +87,7 @@ type
     procedure PRTColorChange(Sender: TObject);
     procedure Tv1MouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure cxTabControl1Change(Sender: TObject);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
   private
     FLeft, FTop: Integer;
     procedure InitGrid();
@@ -111,6 +112,16 @@ begin
   frmDyeClothInspStaffOutputList := nil;
 end;
 
+procedure TfrmDyeClothInspStaffOutputList.FormKeyDown(Sender: TObject;
+  var Key: Word; Shift: TShiftState);
+begin
+  if Key = VK_ESCAPE then  // VK_ESCAPE 是 ESC 键的常量
+  begin
+    Key := 0;  // 清除按键，防止继续传递
+    Close;     // 或者 ModalResult := mrCancel;
+  end;
+end;
+
 procedure TfrmDyeClothInspStaffOutputList.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -190,6 +201,7 @@ begin
   begin
     //v1Column5.Options.Focusing:=False;
   end;
+  KeyPreview := True;  // 确保表单可以预览按键
   //InitGrid();
 end;