From f7ff171ad75e6d2ca4d9b211d01e25839a8ac583 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 12 Feb 2026 10:25:54 +0800 Subject: [PATCH] 1234 --- G01贸易生产计划/TradePlan.dpr | 3 ++- G01贸易生产计划/TradePlan.dproj | 25 +++++++++++------------- G01贸易生产计划/U_DataLink.pas | 2 +- G01贸易生产计划/U_TradeInspSet.dfm | 4 ++++ G01贸易生产计划/U_TradeInspSet.pas | 4 +++- G01贸易生产计划/U_TradePlanList.pas | 2 +- G03贸易布匹检验/TradeInsp.dpr | 3 ++- G03贸易布匹检验/TradeInsp.dproj | 25 +++++++++++------------- G03贸易布匹检验/U_DataLink.pas | 18 +---------------- G03贸易布匹检验/U_TradeClothInspList.dfm | 12 ++++++------ G03贸易布匹检验/U_TradeClothInspList.pas | 3 ++- G03贸易布匹检验/U_TradeMachInsp.dfm | 4 ++++ G03贸易布匹检验/U_TradeMachInsp.pas | 25 +++++------------------- 13 files changed, 53 insertions(+), 77 deletions(-) diff --git a/G01贸易生产计划/TradePlan.dpr b/G01贸易生产计划/TradePlan.dpr index 506d035..7a5d610 100644 --- a/G01贸易生产计划/TradePlan.dpr +++ b/G01贸易生产计划/TradePlan.dpr @@ -27,7 +27,8 @@ uses U_TradeSalesContractSel in '..\G00óͨô\U_TradeSalesContractSel.pas' {frmTradeSalesContractSel}, U_TradePlanList in 'U_TradePlanList.pas' {frmTradePlanList}, U_TradeInspSet in 'U_TradeInspSet.pas' {frmTradeInspSet}, - U_LbaelMapSet in '..\A00ͨô\U_LbaelMapSet.pas' {frmLbaelMapSet}; + U_LbaelMapSet in '..\A00ͨô\U_LbaelMapSet.pas' {frmLbaelMapSet}, + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; {$R *.res} diff --git a/G01贸易生产计划/TradePlan.dproj b/G01贸易生产计划/TradePlan.dproj index 8c6cf9b..06bc500 100644 --- a/G01贸易生产计划/TradePlan.dproj +++ b/G01贸易生产计划/TradePlan.dproj @@ -124,7 +124,7 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - D:\Dp10Repo\项目代码\D10myZesheng\G01贸易生产计划\testDll.exe + D:\D10W\项目代码\D10myZesheng\G01贸易生产计划\testDll.exe @@ -136,26 +136,22 @@ TDataModule - +
frmBaseHelp
- dfm - +
frmBaseInput
- dfm - +
frmBaseList
- dfm - - - - - - + + + + + +
frmZDYHelp
- dfm
frmFjList_RZ
@@ -193,6 +189,7 @@
frmLbaelMapSet
dfm + Cfg_2 Base diff --git a/G01贸易生产计划/U_DataLink.pas b/G01贸易生产计划/U_DataLink.pas index 659a9e4..f41fafa 100644 --- a/G01贸易生产计划/U_DataLink.pas +++ b/G01贸易生产计划/U_DataLink.pas @@ -5,7 +5,7 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses, - System.ImageList; + System.ImageList, dxSkinsCore, dxSkinsDefaultPainters; type TMyThread = class(TThread) diff --git a/G01贸易生产计划/U_TradeInspSet.dfm b/G01贸易生产计划/U_TradeInspSet.dfm index e0d37f5..4bc94f1 100644 --- a/G01贸易生产计划/U_TradeInspSet.dfm +++ b/G01贸易生产计划/U_TradeInspSet.dfm @@ -762,4 +762,8 @@ inherited frmTradeInspSet: TfrmTradeInspSet Left = 59 Top = 352 end + object RMRichObject1: TRMRichObject + Left = 496 + Top = 367 + end end diff --git a/G01贸易生产计划/U_TradeInspSet.pas b/G01贸易生产计划/U_TradeInspSet.pas index f575a90..cf5074c 100644 --- a/G01贸易生产计划/U_TradeInspSet.pas +++ b/G01贸易生产计划/U_TradeInspSet.pas @@ -16,7 +16,8 @@ uses cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore, cxDateUtils, cxImage, cxDBEdit, IdExplicitTLSClientServerBase, RM_Preview, cxPC, U_BaseHelp, System.ImageList, Vcl.ImgList, RTComboBox, RM_BarCode, - RM_e_Xls, dxScrollbarAnnotations; + RM_e_Xls, dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters, + RM_RichEdit; type TfrmTradeInspSet = class(TfrmBaseHelp) @@ -87,6 +88,7 @@ type CDUnit: TComboBox; Label7: TLabel; addwet: TEdit; + RMRichObject1: TRMRichObject; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/G01贸易生产计划/U_TradePlanList.pas b/G01贸易生产计划/U_TradePlanList.pas index 354d266..38eac99 100644 --- a/G01贸易生产计划/U_TradePlanList.pas +++ b/G01贸易生产计划/U_TradePlanList.pas @@ -15,7 +15,7 @@ uses IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math, dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd, - dxScrollbarAnnotations; + dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters; type TfrmTradePlanList = class(TfrmBaseList) diff --git a/G03贸易布匹检验/TradeInsp.dpr b/G03贸易布匹检验/TradeInsp.dpr index 01b84b9..c68bfee 100644 --- a/G03贸易布匹检验/TradeInsp.dpr +++ b/G03贸易布匹检验/TradeInsp.dpr @@ -26,7 +26,8 @@ uses U_LablePrint in '..\A00ͨô\U_LablePrint.pas' {frmLablePrint}, U_TradeMachInsp in 'U_TradeMachInsp.pas' {frmTradeMachInsp}, U_LbaelMapSet in '..\A00ͨô\U_LbaelMapSet.pas' {frmLbaelMapSet}, - U_TradePlanSel in '..\G00óͨô\U_TradePlanSel.pas' {frmTradePlanSel}; + U_TradePlanSel in '..\G00óͨô\U_TradePlanSel.pas' {frmTradePlanSel}, + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; {$R *.res} diff --git a/G03贸易布匹检验/TradeInsp.dproj b/G03贸易布匹检验/TradeInsp.dproj index d19c9c1..0587fb0 100644 --- a/G03贸易布匹检验/TradeInsp.dproj +++ b/G03贸易布匹检验/TradeInsp.dproj @@ -124,7 +124,7 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - D:\Dp10Repo\项目代码\泽晟\G03贸易布匹检验\testDll.exe + D:\D10W\项目代码\D10myZesheng\G03贸易布匹检验\testDll.exe @@ -136,26 +136,22 @@ TDataModule - +
frmBaseHelp
- dfm - +
frmBaseInput
- dfm - +
frmBaseList
- dfm - - - - - - + + + + + +
frmZDYHelp
- dfm
frmFjList_RZ
@@ -189,6 +185,7 @@
frmTradePlanSel
dfm + Cfg_2 Base diff --git a/G03贸易布匹检验/U_DataLink.pas b/G03贸易布匹检验/U_DataLink.pas index 973ea7f..1920775 100644 --- a/G03贸易布匹检验/U_DataLink.pas +++ b/G03贸易布匹检验/U_DataLink.pas @@ -5,23 +5,7 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses, - System.ImageList, - - - - - - - - - - - - - - - - ; + System.ImageList, dxSkinsCore, dxSkinsDefaultPainters; type TMyThread = class(TThread) diff --git a/G03贸易布匹检验/U_TradeClothInspList.dfm b/G03贸易布匹检验/U_TradeClothInspList.dfm index 1c89c5e..3605eb3 100644 --- a/G03贸易布匹检验/U_TradeClothInspList.dfm +++ b/G03贸易布匹检验/U_TradeClothInspList.dfm @@ -20,7 +20,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList AutoSize = True BorderStyle = bsSingle TabOrder = 4 - ExplicitWidth = 1417 DesignSize = ( 1419 24) @@ -128,7 +127,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ParentFont = False PopupMenu = PM_1 TabOrder = 3 - ExplicitWidth = 1417 object Tv1: TcxGridDBTableView OnMouseUp = Tv1MouseUp Navigator.Buttons.CustomButtons = <> @@ -551,7 +549,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList ParentFont = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 1417 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -652,7 +649,6 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Color = 16242829 ParentBackground = False TabOrder = 1 - ExplicitWidth = 1417 object Label3: TLabel Left = 195 Top = 10 @@ -1043,8 +1039,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList end end object MovePanel2: TMovePanel [4] - Left = 592 - Top = 216 + Left = 589 + Top = 217 Width = 289 Height = 49 BevelInner = bvLowered @@ -1156,4 +1152,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList OnClick = N4Click end end + object RMRichObject1: TRMRichObject + Left = 541 + Top = 396 + end end diff --git a/G03贸易布匹检验/U_TradeClothInspList.pas b/G03贸易布匹检验/U_TradeClothInspList.pas index 07f73ce..6212bd5 100644 --- a/G03贸易布匹检验/U_TradeClothInspList.pas +++ b/G03贸易布匹检验/U_TradeClothInspList.pas @@ -14,7 +14,7 @@ uses RM_e_Jpeg, RM_e_txt, RM_e_csv, Math, Clipbrd, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxDateRanges, U_BaseList, dxDateTimeWheelPicker, - dxScrollbarAnnotations; + dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters, RM_RichEdit; type TfrmTradeClothInspList = class(TfrmBaseList) @@ -122,6 +122,7 @@ type ToolButton3: TToolButton; ToolButton4: TToolButton; Tv1Column13: TcxGridDBColumn; + RMRichObject1: TRMRichObject; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/G03贸易布匹检验/U_TradeMachInsp.dfm b/G03贸易布匹检验/U_TradeMachInsp.dfm index 0130985..712e52b 100644 --- a/G03贸易布匹检验/U_TradeMachInsp.dfm +++ b/G03贸易布匹检验/U_TradeMachInsp.dfm @@ -3447,4 +3447,8 @@ Left = 426 Top = 588 end + object RMRichObject1: TRMRichObject + Left = 541 + Top = 396 + end end diff --git a/G03贸易布匹检验/U_TradeMachInsp.pas b/G03贸易布匹检验/U_TradeMachInsp.pas index bce616d..1823c32 100644 --- a/G03贸易布匹检验/U_TradeMachInsp.pas +++ b/G03贸易布匹检验/U_TradeMachInsp.pas @@ -11,26 +11,10 @@ uses RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu, ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox, MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, Menus, - U_BaseList, dxDateRanges, - dxBarBuiltInMenu, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent, - IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, ShellAPI, IdFTP, - FireDAC.Stan.StorageXML, cxPC, dxScrollbarAnnotations, - - - - - - - - - - - - - - - - ; + U_BaseList, dxDateRanges, dxBarBuiltInMenu, cxContainer, cxImage, cxDBEdit, + IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, + IdExplicitTLSClientServerBase, ShellAPI, IdFTP, FireDAC.Stan.StorageXML, cxPC, + dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters, RM_RichEdit; type TfrmTradeMachInsp = class(TfrmBaseList) @@ -300,6 +284,7 @@ type Tv3Column5: TcxGridDBColumn; lbl2: TLabel; AddLenPresent: TEdit; + RMRichObject1: TRMRichObject; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject);