From e1745662ef4826f048bac07469c90aaa65e0fd69 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 13 Dec 2025 17:22:17 +0800 Subject: [PATCH] 20251213 --- .../FabricInspection.skincfg | 90 +++++++++---------- .../ProjectGroup1.bpg | 8 +- 布匹检验(FabricInspection.dll)/U_testdll.dfm | 4 +- .../testDll.skincfg | 50 +++++++++++ .../FinishedClothWarehouse.dof | 2 +- .../U_FinishedClothCZong.dfm | 16 ++-- .../U_FinishedClothCZong.pas | 15 +++- .../U_FinishedClothInList.dfm | 24 +++-- .../U_FinishedClothInList.pas | 1 + .../U_FinishedClothInspection.dfm | 24 +++-- .../U_FinishedClothInspection.pas | 17 +++- .../U_FinishedClothKCList.dfm | 24 +++-- .../U_FinishedClothKCList.pas | 1 + .../U_FinishedClothOutList.dfm | 24 +++-- .../U_FinishedClothOutList.pas | 1 + .../U_FinishedCloth_DCGCAR.dfm | 12 +-- .../U_FinishedCloth_DCGCAR.pas | 15 +++- .../U_FinishedCloth_ZKCL.dfm | 8 +- .../U_FinishedCloth_ZKCL.pas | 15 +++- .../ProjectGroup1.bpg | 8 +- 20 files changed, 239 insertions(+), 120 deletions(-) create mode 100644 布匹检验(FabricInspection.dll)/testDll.skincfg diff --git a/布匹检验(FabricInspection.dll)/FabricInspection.skincfg b/布匹检验(FabricInspection.dll)/FabricInspection.skincfg index 0bd3d07..89edbfe 100644 --- a/布匹检验(FabricInspection.dll)/FabricInspection.skincfg +++ b/布匹检验(FabricInspection.dll)/FabricInspection.skincfg @@ -2,49 +2,49 @@ Default=1 ShowNotifications=1 Enabled=1 -dxSkinBlack=0 -dxSkinBlue=0 -dxSkinBlueprint=0 -dxSkinCaramel=0 -dxSkinCoffee=0 -dxSkinDarkRoom=0 -dxSkinDarkSide=0 -dxSkinDevExpressDarkStyle=0 -dxSkinDevExpressStyle=0 -dxSkinFoggy=0 -dxSkinGlassOceans=0 -dxSkinHighContrast=0 -dxSkiniMaginary=0 -dxSkinLilian=0 -dxSkinLiquidSky=0 -dxSkinLondonLiquidSky=0 -dxSkinMcSkin=0 -dxSkinMetropolis=0 -dxSkinMetropolisDark=0 -dxSkinMoneyTwins=0 -dxSkinOffice2007Black=0 -dxSkinOffice2007Blue=0 -dxSkinOffice2007Green=0 -dxSkinOffice2007Pink=0 -dxSkinOffice2007Silver=0 -dxSkinOffice2010Black=0 -dxSkinOffice2010Blue=0 -dxSkinOffice2010Silver=0 -dxSkinOffice2013DarkGray=0 -dxSkinOffice2013LightGray=0 -dxSkinOffice2013White=0 -dxSkinPumpkin=0 -dxSkinSeven=0 -dxSkinSevenClassic=0 -dxSkinSharp=0 -dxSkinSharpPlus=0 -dxSkinSilver=0 -dxSkinSpringTime=0 -dxSkinStardust=0 -dxSkinSummer2008=0 -dxSkinTheAsphaltWorld=0 +dxSkinBlack=1 +dxSkinBlue=1 +dxSkinBlueprint=1 +dxSkinCaramel=1 +dxSkinCoffee=1 +dxSkinDarkRoom=1 +dxSkinDarkSide=1 +dxSkinDevExpressDarkStyle=1 +dxSkinDevExpressStyle=1 +dxSkinFoggy=1 +dxSkinGlassOceans=1 +dxSkinHighContrast=1 +dxSkiniMaginary=1 +dxSkinLilian=1 +dxSkinLiquidSky=1 +dxSkinLondonLiquidSky=1 +dxSkinMcSkin=1 +dxSkinMetropolis=1 +dxSkinMetropolisDark=1 +dxSkinMoneyTwins=1 +dxSkinOffice2007Black=1 +dxSkinOffice2007Blue=1 +dxSkinOffice2007Green=1 +dxSkinOffice2007Pink=1 +dxSkinOffice2007Silver=1 +dxSkinOffice2010Black=1 +dxSkinOffice2010Blue=1 +dxSkinOffice2010Silver=1 +dxSkinOffice2013DarkGray=1 +dxSkinOffice2013LightGray=1 +dxSkinOffice2013White=1 +dxSkinPumpkin=1 +dxSkinSeven=1 +dxSkinSevenClassic=1 +dxSkinSharp=1 +dxSkinSharpPlus=1 +dxSkinSilver=1 +dxSkinSpringTime=1 +dxSkinStardust=1 +dxSkinSummer2008=1 +dxSkinTheAsphaltWorld=1 dxSkinsDefaultPainters=1 -dxSkinValentine=0 -dxSkinVS2010=0 -dxSkinWhiteprint=0 -dxSkinXmas2008Blue=0 +dxSkinValentine=1 +dxSkinVS2010=1 +dxSkinWhiteprint=1 +dxSkinXmas2008Blue=1 diff --git a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg index c589fee..7d64d03 100644 --- a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg +++ b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg @@ -9,15 +9,9 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = TradeManage.dll testDll.exe +PROJECTS = #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -TradeManage.dll: ..\..\..\Dp7Repo\Ŀ\D7DJfhshengxing\\TradeManage.dpr - $(DCC) - -testDll.exe: ..\..\..\Dp7Repo\Ŀ\D7DJfhshengxing\\testDll.dpr - $(DCC) - diff --git a/布匹检验(FabricInspection.dll)/U_testdll.dfm b/布匹检验(FabricInspection.dll)/U_testdll.dfm index 6b709b8..5d6719f 100644 --- a/布匹检验(FabricInspection.dll)/U_testdll.dfm +++ b/布匹检验(FabricInspection.dll)/U_testdll.dfm @@ -1,6 +1,6 @@ object Form1: TForm1 - Left = 203 - Top = 121 + Left = 487 + Top = 279 Width = 791 Height = 554 Caption = 'Form1' diff --git a/布匹检验(FabricInspection.dll)/testDll.skincfg b/布匹检验(FabricInspection.dll)/testDll.skincfg new file mode 100644 index 0000000..89edbfe --- /dev/null +++ b/布匹检验(FabricInspection.dll)/testDll.skincfg @@ -0,0 +1,50 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=1 +dxSkinBlack=1 +dxSkinBlue=1 +dxSkinBlueprint=1 +dxSkinCaramel=1 +dxSkinCoffee=1 +dxSkinDarkRoom=1 +dxSkinDarkSide=1 +dxSkinDevExpressDarkStyle=1 +dxSkinDevExpressStyle=1 +dxSkinFoggy=1 +dxSkinGlassOceans=1 +dxSkinHighContrast=1 +dxSkiniMaginary=1 +dxSkinLilian=1 +dxSkinLiquidSky=1 +dxSkinLondonLiquidSky=1 +dxSkinMcSkin=1 +dxSkinMetropolis=1 +dxSkinMetropolisDark=1 +dxSkinMoneyTwins=1 +dxSkinOffice2007Black=1 +dxSkinOffice2007Blue=1 +dxSkinOffice2007Green=1 +dxSkinOffice2007Pink=1 +dxSkinOffice2007Silver=1 +dxSkinOffice2010Black=1 +dxSkinOffice2010Blue=1 +dxSkinOffice2010Silver=1 +dxSkinOffice2013DarkGray=1 +dxSkinOffice2013LightGray=1 +dxSkinOffice2013White=1 +dxSkinPumpkin=1 +dxSkinSeven=1 +dxSkinSevenClassic=1 +dxSkinSharp=1 +dxSkinSharpPlus=1 +dxSkinSilver=1 +dxSkinSpringTime=1 +dxSkinStardust=1 +dxSkinSummer2008=1 +dxSkinTheAsphaltWorld=1 +dxSkinsDefaultPainters=1 +dxSkinValentine=1 +dxSkinVS2010=1 +dxSkinWhiteprint=1 +dxSkinXmas2008Blue=1 diff --git a/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof b/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof index 5b11953..2313b3e 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof +++ b/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\D7szChenfeng\Ʒֿ(FinishedClothWarehouse.dll)\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7szChenfeng\Ʒֿ(FinishedClothWarehouse.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothCZong.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothCZong.dfm index 168e16d..85d4cc8 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothCZong.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothCZong.dfm @@ -20,7 +20,7 @@ object frmFinishedClothCZong: TfrmFinishedClothCZong object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1349 + Width = 1341 AutoSize = True ButtonHeight = 30 ButtonWidth = 59 @@ -66,8 +66,8 @@ object frmFinishedClothCZong: TfrmFinishedClothCZong object cxGrid1: TcxGrid Left = 0 Top = 115 - Width = 1349 - Height = 575 + Width = 1341 + Height = 567 Align = alClient PopupMenu = PopupMenu1 TabOrder = 1 @@ -260,7 +260,7 @@ object frmFinishedClothCZong: TfrmFinishedClothCZong object Panel3: TPanel Left = 0 Top = 85 - Width = 1349 + Width = 1341 Height = 30 Align = alTop BevelOuter = bvNone @@ -268,7 +268,7 @@ object frmFinishedClothCZong: TfrmFinishedClothCZong object Panel2: TPanel Left = 0 Top = 0 - Width = 1349 + Width = 1341 Height = 30 Align = alTop BevelOuter = bvNone @@ -309,7 +309,7 @@ object frmFinishedClothCZong: TfrmFinishedClothCZong object Panel6: TPanel Left = 205 Top = 0 - Width = 1144 + Width = 1136 Height = 30 Align = alClient AutoSize = True @@ -317,7 +317,7 @@ object frmFinishedClothCZong: TfrmFinishedClothCZong BorderStyle = bsSingle TabOrder = 1 DesignSize = ( - 1140 + 1132 26) object Label1: TLabel Left = 64 @@ -410,7 +410,7 @@ object frmFinishedClothCZong: TfrmFinishedClothCZong object Panel1: TPanel Left = 0 Top = 32 - Width = 1349 + Width = 1341 Height = 53 Align = alTop BevelInner = bvRaised diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothCZong.pas b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothCZong.pas index 53bcc8c..1632e89 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothCZong.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothCZong.pas @@ -13,7 +13,20 @@ uses cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic, RM_e_Jpeg, RM_e_txt, RM_e_csv, RM_E_llPDF, Math, Clipbrd, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, - dxSkinsDefaultPainters, dxSkinscxPCPainter; + dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue, + dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, + dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, + dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, + dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, + dxSkinXmas2008Blue; type TfrmFinishedClothCZong = class(TForm) diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.dfm index da63039..34071af 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.dfm @@ -1,6 +1,6 @@ object frmFinishedClothInList: TfrmFinishedClothInList - Left = 200 - Top = 310 + Left = -6 + Top = 65 Width = 1249 Height = 765 Caption = #25104#21697#20837#24211#31649#29702 @@ -20,7 +20,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1241 + Width = 1233 AutoSize = True ButtonHeight = 30 ButtonWidth = 83 @@ -82,7 +82,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList object Panel1: TPanel Left = 0 Top = 32 - Width = 1241 + Width = 1233 Height = 62 Align = alTop BevelInner = bvRaised @@ -415,8 +415,8 @@ object frmFinishedClothInList: TfrmFinishedClothInList object cxGrid2: TcxGrid Left = 0 Top = 124 - Width = 1241 - Height = 610 + Width = 1233 + Height = 602 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 @@ -535,6 +535,12 @@ object frmFinishedClothInList: TfrmFinishedClothInList Options.Editing = False Width = 73 end + object Tv1Column11: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'edZDFNo' + HeaderAlignmentHorz = taCenter + Width = 83 + end object v2Column1: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'P_CodeName' @@ -682,7 +688,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList object Panel2: TPanel Left = 0 Top = 94 - Width = 1241 + Width = 1233 Height = 30 Align = alTop BevelOuter = bvNone @@ -723,7 +729,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList object Panel6: TPanel Left = 205 Top = 0 - Width = 1036 + Width = 1028 Height = 30 Align = alClient AutoSize = True @@ -731,7 +737,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList BorderStyle = bsSingle TabOrder = 1 DesignSize = ( - 1032 + 1024 26) object Label7: TLabel Left = 64 diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.pas b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.pas index 773e524..aa1aef3 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.pas @@ -127,6 +127,7 @@ type carno: TEdit; Tv1Column5: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; + Tv1Column11: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm index 29154b7..ba751ae 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm @@ -1,6 +1,6 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection - Left = 53 - Top = 333 + Left = 54 + Top = 187 Width = 1357 Height = 721 Caption = #25104#21697#26816#39564#25253#21578 @@ -20,7 +20,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1349 + Width = 1341 AutoSize = True ButtonHeight = 30 ButtonWidth = 107 @@ -155,7 +155,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection object Panel1: TPanel Left = 0 Top = 32 - Width = 1349 + Width = 1341 Height = 53 Align = alTop BevelInner = bvRaised @@ -428,8 +428,8 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection object cxGrid1: TcxGrid Left = 0 Top = 115 - Width = 1349 - Height = 575 + Width = 1341 + Height = 567 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 @@ -547,6 +547,12 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection Options.Editing = False Width = 100 end + object Tv1Column12: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'edZDFNo' + HeaderAlignmentHorz = taCenter + Width = 84 + end object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'P_MF' @@ -772,7 +778,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection object Panel3: TPanel Left = 0 Top = 85 - Width = 1349 + Width = 1341 Height = 30 Align = alTop BevelOuter = bvNone @@ -814,7 +820,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection object Panel6: TPanel Left = 253 Top = 0 - Width = 1096 + Width = 1088 Height = 30 Align = alClient AutoSize = True @@ -822,7 +828,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection BorderStyle = bsSingle TabOrder = 1 DesignSize = ( - 1092 + 1084 26) object Label31: TLabel Left = 25 diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas index 822b815..f194e40 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas @@ -13,7 +13,21 @@ uses cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic, RM_e_Jpeg, RM_e_txt, RM_e_csv, RM_E_llPDF, Math, Clipbrd, cxPC, cxButtonEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, - dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter, StrUtils; + dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter, StrUtils, + dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, + dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, + dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, + dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, + dxSkinXmas2008Blue; type TfrmFinishedClothInspection = class(TForm) @@ -120,6 +134,7 @@ type ToolButton3: TToolButton; Tv1Column3: TcxGridDBColumn; Tv1Column10: TcxGridDBColumn; + Tv1Column12: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm index 8c38fda..1362f8b 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm @@ -1,6 +1,6 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList - Left = 186 - Top = 367 + Left = -6 + Top = 33 Width = 1247 Height = 531 Caption = #25104#21697#24211#23384#21015#34920 @@ -18,7 +18,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1239 + Width = 1231 Height = 33 ButtonHeight = 30 ButtonWidth = 59 @@ -98,7 +98,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object Panel1: TPanel Left = 0 Top = 33 - Width = 1239 + Width = 1231 Height = 62 Align = alTop BevelInner = bvRaised @@ -283,7 +283,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object Panel2: TPanel Left = 0 Top = 95 - Width = 1239 + Width = 1231 Height = 30 Align = alTop BevelOuter = bvNone @@ -324,7 +324,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object Panel6: TPanel Left = 205 Top = 0 - Width = 1034 + Width = 1026 Height = 30 Align = alClient AutoSize = True @@ -332,7 +332,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList BorderStyle = bsSingle TabOrder = 1 DesignSize = ( - 1030 + 1022 26) object Label1: TLabel Left = 64 @@ -424,8 +424,8 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList object cxGrid2: TcxGrid Left = 0 Top = 125 - Width = 1239 - Height = 375 + Width = 1231 + Height = 367 Align = alClient PopupMenu = PopupMenu1 TabOrder = 4 @@ -571,6 +571,12 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList Options.Editing = False Width = 73 end + object Tv1Column14: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'edZDFNo' + HeaderAlignmentHorz = taCenter + Width = 74 + end object v2Column1: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'P_CodeName' diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.pas b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.pas index 8cbf2a4..be394b7 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.pas @@ -106,6 +106,7 @@ type Tv1Column11: TcxGridDBColumn; Tv1Column12: TcxGridDBColumn; Tv1Column13: TcxGridDBColumn; + Tv1Column14: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); procedure ConNoMChange(Sender: TObject); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.dfm index ff35193..318ab43 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.dfm @@ -1,6 +1,6 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList - Left = 231 - Top = 216 + Left = 111 + Top = 91 Width = 1151 Height = 515 Caption = #25104#21697#20986#24211#31649#29702 @@ -20,7 +20,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1143 + Width = 1135 AutoSize = True ButtonHeight = 30 ButtonWidth = 83 @@ -114,7 +114,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList object Panel1: TPanel Left = 0 Top = 32 - Width = 1143 + Width = 1135 Height = 62 Align = alTop BevelInner = bvRaised @@ -440,7 +440,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList object Panel2: TPanel Left = 0 Top = 94 - Width = 1143 + Width = 1135 Height = 30 Align = alTop BevelOuter = bvNone @@ -481,7 +481,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList object Panel6: TPanel Left = 205 Top = 0 - Width = 938 + Width = 930 Height = 30 Align = alClient AutoSize = True @@ -489,7 +489,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList BorderStyle = bsSingle TabOrder = 1 DesignSize = ( - 934 + 926 26) object Label7: TLabel Left = 64 @@ -581,8 +581,8 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList object cxGrid2: TcxGrid Left = 0 Top = 124 - Width = 1143 - Height = 360 + Width = 1135 + Height = 352 Align = alClient PopupMenu = PopupMenu1 TabOrder = 4 @@ -716,6 +716,12 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList Options.Editing = False Width = 73 end + object Tv1Column11: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'edZDFNo' + HeaderAlignmentHorz = taCenter + Width = 78 + end object v2Column1: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'P_CodeName' diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.pas b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.pas index d75d127..3829a7d 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.pas @@ -123,6 +123,7 @@ type carno: TEdit; Tv1Column4: TcxGridDBColumn; Tv1Column7: TcxGridDBColumn; + Tv1Column11: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_DCGCAR.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_DCGCAR.dfm index 80f712b..0fa8136 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_DCGCAR.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_DCGCAR.dfm @@ -1,6 +1,6 @@ object frmFinishedCloth_DCGCAR: TfrmFinishedCloth_DCGCAR - Left = 257 - Top = 137 + Left = 192 + Top = 244 Width = 1357 Height = 721 Caption = #25377#36710#24037#36724#21345#32479#35745 @@ -19,7 +19,7 @@ object frmFinishedCloth_DCGCAR: TfrmFinishedCloth_DCGCAR object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1349 + Width = 1341 AutoSize = True ButtonHeight = 30 ButtonWidth = 83 @@ -81,8 +81,8 @@ object frmFinishedCloth_DCGCAR: TfrmFinishedCloth_DCGCAR object cxGrid1: TcxGrid Left = 0 Top = 85 - Width = 1349 - Height = 605 + Width = 1341 + Height = 597 Align = alClient PopupMenu = PopupMenu1 TabOrder = 1 @@ -249,7 +249,7 @@ object frmFinishedCloth_DCGCAR: TfrmFinishedCloth_DCGCAR object Panel1: TPanel Left = 0 Top = 32 - Width = 1349 + Width = 1341 Height = 53 Align = alTop BevelInner = bvRaised diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_DCGCAR.pas b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_DCGCAR.pas index 8dcdcad..c35c6cf 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_DCGCAR.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_DCGCAR.pas @@ -13,7 +13,20 @@ uses cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic, RM_e_Jpeg, RM_e_txt, RM_e_csv, RM_E_llPDF, Math, Clipbrd, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, - dxSkinsDefaultPainters, dxSkinscxPCPainter; + dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue, + dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, + dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, + dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, + dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, + dxSkinXmas2008Blue; type TfrmFinishedCloth_DCGCAR = class(TForm) diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.dfm b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.dfm index 9024917..6046cd4 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.dfm +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.dfm @@ -19,7 +19,7 @@ object frmFinishedCloth_ZKCL: TfrmFinishedCloth_ZKCL object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1349 + Width = 1341 AutoSize = True ButtonHeight = 30 ButtonWidth = 59 @@ -65,8 +65,8 @@ object frmFinishedCloth_ZKCL: TfrmFinishedCloth_ZKCL object cxGrid1: TcxGrid Left = 0 Top = 85 - Width = 1349 - Height = 605 + Width = 1341 + Height = 597 Align = alClient PopupMenu = PopupMenu1 TabOrder = 1 @@ -259,7 +259,7 @@ object frmFinishedCloth_ZKCL: TfrmFinishedCloth_ZKCL object Panel1: TPanel Left = 0 Top = 32 - Width = 1349 + Width = 1341 Height = 53 Align = alTop BevelInner = bvRaised diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.pas b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.pas index 346cfd6..7aa2d06 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_FinishedCloth_ZKCL.pas @@ -13,7 +13,20 @@ uses cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic, RM_e_Jpeg, RM_e_txt, RM_e_csv, RM_E_llPDF, Math, Clipbrd, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, - dxSkinsDefaultPainters, dxSkinscxPCPainter; + dxSkinsDefaultPainters, dxSkinscxPCPainter, dxSkinBlack, dxSkinBlue, + dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, + dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, + dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, + dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, + dxSkinXmas2008Blue; type TfrmFinishedCloth_ZKCL = class(TForm) diff --git a/梭织计划单(ShuttleSchedule.dll)/ProjectGroup1.bpg b/梭织计划单(ShuttleSchedule.dll)/ProjectGroup1.bpg index 47971ac..7d64d03 100644 --- a/梭织计划单(ShuttleSchedule.dll)/ProjectGroup1.bpg +++ b/梭织计划单(ShuttleSchedule.dll)/ProjectGroup1.bpg @@ -9,15 +9,9 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = YSYF.dll testDll.exe +PROJECTS = #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -YSYF.dll: ..\..\..\Dp7Repo\Ŀ\D7DJfhshengxing\ӦӦ(YSYF.dll)\YSYF.dpr - $(DCC) - -testDll.exe: ..\..\..\Dp7Repo\Ŀ\D7DJfhshengxing\ӦӦ(YSYF.dll)\testDll.dpr - $(DCC) -