From 18e47c1234de22ed225e5df2e60df6267a84f8f6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 30 Apr 2026 19:07:12 +0800 Subject: [PATCH] 20260430 --- 检验管理/TradeManage.dof | 2 +- 检验管理/TradeManage.skincfg | 50 ++++++++++++++++++++++++ 检验管理/U_MJManageNewFDNew.dfm | 20 +++++----- 检验管理/U_MJManageNewFDNew.pas | 48 ++++++++++++++++++----- 检验管理/U_ProductOrderNewList.dfm | 62 +++++++++++++++--------------- 检验管理/U_ProductOrderNewList.pas | 15 +++++++- 6 files changed, 145 insertions(+), 52 deletions(-) create mode 100644 检验管理/TradeManage.skincfg diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index 0b880b6..ca691fe 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\𸴺\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJhengrui\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/检验管理/TradeManage.skincfg b/检验管理/TradeManage.skincfg new file mode 100644 index 0000000..89edbfe --- /dev/null +++ b/检验管理/TradeManage.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/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm index bcf4828..c1faed4 100644 --- a/检验管理/U_MJManageNewFDNew.dfm +++ b/检验管理/U_MJManageNewFDNew.dfm @@ -21,7 +21,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 0 Top = 87 Width = 214 - Height = 768 + Height = 776 Align = alLeft TabOrder = 0 object Tv3: TcxGridDBTableView @@ -125,8 +125,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ScrollBox1: TScrollBox Left = 729 Top = 87 - Width = 514 - Height = 768 + Width = 522 + Height = 776 Align = alClient Color = clWhite ParentColor = False @@ -978,7 +978,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 428 Top = 87 Width = 301 - Height = 768 + Height = 776 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2025,7 +2025,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 214 Top = 87 Width = 214 - Height = 768 + Height = 776 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -2034,7 +2034,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 2 Top = 2 Width = 210 - Height = 443 + Height = 451 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2142,7 +2142,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel8: TPanel Left = 2 - Top = 445 + Top = 453 Width = 210 Height = 28 Align = alBottom @@ -2157,7 +2157,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object AOrdDefNote1: TRichEdit Left = 2 - Top = 473 + Top = 481 Width = 210 Height = 293 Align = alBottom @@ -2398,7 +2398,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1243 + Width = 1251 Height = 30 AutoSize = True ButtonHeight = 30 @@ -2586,7 +2586,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel6: TPanel Left = 0 Top = 30 - Width = 1243 + Width = 1251 Height = 57 Align = alTop BevelInner = bvRaised diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas index 0e1d132..9b974f3 100644 --- a/检验管理/U_MJManageNewFDNew.pas +++ b/检验管理/U_MJManageNewFDNew.pas @@ -243,7 +243,7 @@ type Label44: TLabel; Label46: TLabel; Label47: TLabel; - Label48: TLabel; + Label48: TLabel; Label51: TLabel; Label52: TLabel; BTAdd: TButton; @@ -499,7 +499,7 @@ end; procedure TfrmMJManageNewFDNewSF.PrtBaoData(FBaoid: string); var fPrintFile: string; - Txt, fImagePath: string; + Txt, fImagePath, Txt1, fImagePath1: string; Moudle: THandle; Makebar: TMakebar; Mixtext: TMixtext; @@ -512,7 +512,7 @@ begin begin Close; SQL.Clear; - sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName,'); + sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName,C.KHorderNo,'); sql.Add('PRTCodeName=DBO.F_Get_Order_SubStr(BaoID,''BNCodeName''),'); sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),'); sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), '); @@ -522,14 +522,22 @@ begin sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),'); sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), '); sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), '); - SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen'); + SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen,'); + + sql.Add(' STUFF((SELECT '','' + cast(MJXH as varchar(50)) '); + sql.Add(' FROM WFB_MJJY'); + sql.Add(' WHERE baoID = ''' + Trim(FBaoid) + ''''); + sql.Add(' FOR XML PATH('''')), 1, 1, '''') AS rollNos '); + sql.Add('from WFB_MJJY A'); sql.Add('inner join JYOrder_Sub C on C.SubID=A.SubID'); sql.Add('inner join JYOrder_Main D on D.MainID=A.MainID'); SQL.Add('where A.BaoID=''' + Trim(FBaoid) + ''''); - SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName'); + SQL.ADD('group by A.Baoid,A.BaoNo,A.MJTypeOther,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.BlBName,C.KHorderNo'); +// ShowMessage(SQL.Text); Open; end; + if ADOQueryPrint.RecordCount > 1 then begin Application.MessageBox('´!', 'ʾ', 0); @@ -545,7 +553,7 @@ begin @Makebar := GetProcAddress(Moudle, 'Make'); @Mixtext := GetProcAddress(Moudle, 'MixText'); Txt := trim(FBaoid); - fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp'; + fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp1.bmp'; if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil); if FileExists(fImagePath) then @@ -556,6 +564,23 @@ begin exit; end; + try + Moudle := LoadLibrary('MakeQRBarcode.dll'); + @Makebar := GetProcAddress(Moudle, 'Make'); + @Mixtext := GetProcAddress(Moudle, 'MixText'); + Txt1 := Trim(ADOQueryPrint.fieldbyname('rollNos').AsString); + Txt1 := UTF8Encode(Txt1); + fImagePath1 := ExtractFilePath(Application.ExeName) + 'image\temp1.bmp'; + if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then + CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil); + if FileExists(fImagePath1) then + DeleteFile(fImagePath1); + Makebar(pchar(Txt1), Length(Txt1), 3, 3, 0, PChar(fImagePath1), 3); + except + application.MessageBox('ʧܣ', 'ʾϢ', MB_ICONERROR); + exit; + end; + if Trim(ADOQueryPrint.fieldbyname('NLBName').AsString) <> '' then begin ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('NLBName').AsString), ADOCmd); @@ -576,6 +601,7 @@ begin if FileExists(fPrintFile) then begin RMVariables['QRBARCODE'] := fImagePath; + RMVariables['QRBARCODE1'] := fImagePath1; RM2.LoadFromFile(fPrintFile); RM2.DefaultCopies := 1; //RM2.ShowReport; @@ -584,6 +610,8 @@ begin end; + + procedure TfrmMJManageNewFDNewSF.On1301(var Message: Tmessage); var i1, i2: integer; @@ -2020,10 +2048,10 @@ begin // end; // if (trim(Edit5.text) <> '') then // begin - if Trim(Edit6.Text) = '' then - begin - PrtData(FFFMJID); - end; + if Trim(Edit6.Text) = '' then + begin + PrtData(FFFMJID); + end; // end; if Trim(Edit6.Text) = '' then diff --git a/检验管理/U_ProductOrderNewList.dfm b/检验管理/U_ProductOrderNewList.dfm index afc5fdc..a69eb01 100644 --- a/检验管理/U_ProductOrderNewList.dfm +++ b/检验管理/U_ProductOrderNewList.dfm @@ -20,7 +20,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -109,66 +110,67 @@ object frmProductOrderNewList: TfrmProductOrderNewList AutoSize = True Caption = #35746#21333#23436#25104 ImageIndex = 41 + Wrap = True OnClick = TWCClick end object TNoWC: TToolButton - Left = 591 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #25764#38144#23436#25104 ImageIndex = 86 OnClick = TNoWCClick end object TBExport: TToolButton - Left = 678 - Top = 0 + Left = 87 + Top = 30 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TFJ: TToolButton - Left = 741 - Top = 0 + Left = 150 + Top = 30 AutoSize = True Caption = #25351#31034#21333#38468#20214 ImageIndex = 57 OnClick = TFJClick end object TBPrint: TToolButton - Left = 840 - Top = 0 + Left = 249 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = TBPrintClick end object ToolButton4: TToolButton - Left = 903 - Top = 0 + Left = 312 + Top = 30 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton4Click end object ToolButton5: TToolButton - Left = 990 - Top = 0 + Left = 399 + Top = 30 Caption = #30133#28857#31649#29702 ImageIndex = 132 OnClick = ToolButton5Click end object ToolButton6: TToolButton - Left = 1085 - Top = 0 + Left = 494 + Top = 30 AutoSize = True Caption = #26085#24535 ImageIndex = 72 OnClick = ToolButton6Click end object TBClose: TToolButton - Left = 1148 - Top = 0 + Left = 557 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -177,8 +179,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel1: TPanel Left = 0 - Top = 32 - Width = 1366 + Top = 62 + Width = 1374 Height = 40 Align = alTop BevelInner = bvRaised @@ -406,8 +408,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxGrid1: TcxGrid Left = 0 - Top = 95 - Width = 1366 + Top = 125 + Width = 1374 Height = 333 Align = alTop TabOrder = 3 @@ -803,8 +805,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxSplitter1: TcxSplitter Left = 0 - Top = 451 - Width = 1366 + Top = 459 + Width = 1374 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -812,8 +814,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel2: TPanel Left = 0 - Top = 459 - Width = 1366 + Top = 467 + Width = 1374 Height = 256 Align = alBottom Caption = 'Panel2' @@ -821,7 +823,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 987 + Width = 995 Height = 254 Align = alClient TabOrder = 0 @@ -1136,7 +1138,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList end end object GroupBox1: TGroupBox - Left = 988 + Left = 996 Top = 1 Width = 377 Height = 254 @@ -1166,8 +1168,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxTabControl1: TcxTabControl Left = 0 - Top = 72 - Width = 1366 + Top = 102 + Width = 1374 Height = 23 Align = alTop TabOrder = 2 @@ -1180,7 +1182,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 23 - ClientRectRight = 1366 + ClientRectRight = 1374 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/检验管理/U_ProductOrderNewList.pas b/检验管理/U_ProductOrderNewList.pas index 8cc4e25..fae6cbe 100644 --- a/检验管理/U_ProductOrderNewList.pas +++ b/检验管理/U_ProductOrderNewList.pas @@ -12,7 +12,20 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu; + dxBarBuiltInMenu, dxSkinsCore, 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, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmProductOrderNewList = class(TForm)