From ee19d91d146ee5404cd1930038f8a3256f581a55 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Mon, 27 Oct 2025 14:26:46 +0800 Subject: [PATCH] 1 --- .../FabricInspection.dof | 2 +- .../FabricInspection.skincfg | 50 +++++++++++++++++++ .../ProjectGroup1.bpg | 6 +-- .../U_ClothSCDCGAnPai.dfm | 4 +- .../U_ClothSCDCGAnPai.pas | 4 +- .../U_GreyInspection.dfm | 20 +++++--- .../U_GreyInspection.pas | 1 + 7 files changed, 73 insertions(+), 14 deletions(-) create mode 100644 布匹检验(FabricInspection.dll)/FabricInspection.skincfg diff --git a/布匹检验(FabricInspection.dll)/FabricInspection.dof b/布匹检验(FabricInspection.dll)/FabricInspection.dof index ee53498..83fcf93 100644 --- a/布匹检验(FabricInspection.dll)/FabricInspection.dof +++ b/布匹检验(FabricInspection.dll)/FabricInspection.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\³Â·á\²¼Æ¥¼ìÑé(FabricInspection.dll)\testDll.exe +HostApplication=D:\ÏîÄ¿´úÂë\D7szChenfeng\²¼Æ¥¼ìÑé(FabricInspection.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/布匹检验(FabricInspection.dll)/FabricInspection.skincfg b/布匹检验(FabricInspection.dll)/FabricInspection.skincfg new file mode 100644 index 0000000..554ddb0 --- /dev/null +++ b/布匹检验(FabricInspection.dll)/FabricInspection.skincfg @@ -0,0 +1,50 @@ +[ExpressSkins] +Default=1 +ShowNotifications=1 +Enabled=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=1 +dxSkinVS2010=1 +dxSkinWhiteprint=1 +dxSkinXmas2008Blue=1 diff --git a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg index 9065282..6db2015 100644 --- a/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg +++ b/布匹检验(FabricInspection.dll)/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = FinishedClothWarehouse.dll testDll.exe +PROJECTS = TradeManage.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ -FinishedClothWarehouse.dll: ..\³ÉÆ·²Ö¿â(FinishedClothWarehouse.dll)\FinishedClothWarehouse.dpr +TradeManage.dll: ..\..\..\Dp7Repo\ÏîÄ¿´úÂë\D7DJpingfeng\´ò¾í¼ìÑé¹ÜÀí\TradeManage.dpr $(DCC) -testDll.exe: ..\³ÉÆ·²Ö¿â(FinishedClothWarehouse.dll)\testDll.dpr +testDll.exe: ..\..\..\Dp7Repo\ÏîÄ¿´úÂë\D7DJpingfeng\´ò¾í¼ìÑé¹ÜÀí\testDll.dpr $(DCC) diff --git a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm index afcfcd3..cdd315d 100644 --- a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm +++ b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.dfm @@ -1,6 +1,6 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai - Left = 142 - Top = 80 + Left = 474 + Top = 293 Width = 1413 Height = 719 Caption = #26631#31614#25171#21360 diff --git a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas index 23a269c..ccef535 100644 --- a/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas +++ b/布匹检验(FabricInspection.dll)/U_ClothSCDCGAnPai.pas @@ -387,12 +387,13 @@ begin begin Close; sql.Clear; - sql.add(' select *,edtkano=(select edtkano from pd_plan_Card e where e.pcid=a.pcid) from PD_Plan_AnPai A'); + sql.add(' select *,edtkano=(select edtkano from pd_plan_Card e where e.pcid=a.pcid) ,edZDFNo=(select edZDFNo from pd_plan_Card e where e.pcid=a.pcid) from PD_Plan_AnPai A'); sql.add(' INNER JOIN PD_Plan_Main B on A.MainID =B.MainID '); sql.add(' INNER JOIN PD_Plan_SUB C on B.MainID =C.MainID '); sql.add(' where APID in (' + WSql + ')'); sql.add(' Order by APXH'); + //ShowMessage(SQL.text); Open; end; SCreateCDS20(ADOQueryTemp, CDS_PRT); @@ -430,6 +431,7 @@ begin RM2.LoadFromFile(fPrintFile); RMVariables['QRBARCODE'] := fImagePath; RMVariables['APXH'] := CDS_PRT.fieldbyname('APXH').AsString; + RMVariables['edZDFNo'] := CDS_PRT.fieldbyname('edZDFNo').AsString; RM2.PrintReport; end else diff --git a/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm b/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm index 9f76cd6..861f75b 100644 --- a/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm +++ b/布匹检验(FabricInspection.dll)/U_GreyInspection.dfm @@ -1,8 +1,8 @@ object frmGreyInspection: TfrmGreyInspection - Left = 571 - Top = 124 + Left = 450 + Top = 348 Width = 1316 - Height = 753 + Height = 755 Caption = #26797#32455#22383#24067#26816#39564 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -22,7 +22,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 0 Top = 85 Width = 217 - Height = 637 + Height = 639 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -764,7 +764,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 217 Top = 85 Width = 296 - Height = 637 + Height = 639 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -773,7 +773,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 2 Top = 113 Width = 292 - Height = 522 + Height = 524 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clBlue @@ -1145,7 +1145,7 @@ object frmGreyInspection: TfrmGreyInspection Left = 513 Top = 85 Width = 795 - Height = 637 + Height = 639 Align = alClient TabOrder = 3 object Tv3: TcxGridDBTableView @@ -1240,6 +1240,12 @@ object frmGreyInspection: TfrmGreyInspection HeaderAlignmentHorz = taCenter Width = 79 end + object Tv3Column6: TcxGridDBColumn + Caption = #25209#21495 + DataBinding.FieldName = 'edZDFNo' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGridLevel2: TcxGridLevel GridView = Tv3 diff --git a/布匹检验(FabricInspection.dll)/U_GreyInspection.pas b/布匹检验(FabricInspection.dll)/U_GreyInspection.pas index d39a058..fc6e741 100644 --- a/布匹检验(FabricInspection.dll)/U_GreyInspection.pas +++ b/布匹检验(FabricInspection.dll)/U_GreyInspection.pas @@ -155,6 +155,7 @@ type Tv3Column4: TcxGridDBColumn; ToolButton6: TToolButton; Tv3Column5: TcxGridDBColumn; + Tv3Column6: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject);