From ca5a479995248831089f30e1e39a5f808458cdcf Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Fri, 18 Jul 2025 14:47:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A0=81=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 复合检验管理/TradeManage.dof | 2 +- 复合检验管理/U_JYOrderCDOne.dfm | 7 +-- 复合检验管理/U_JYOrderCDOne.pas | 71 +++++++++++++++++++++++++++-- 复合检验管理/U_MJManageNewFDNew.pas | 14 +++--- 4 files changed, 80 insertions(+), 14 deletions(-) diff --git a/复合检验管理/TradeManage.dof b/复合检验管理/TradeManage.dof index 47fa82f..5914e60 100644 --- a/复合检验管理/TradeManage.dof +++ b/复合检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\\ϼ\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJjinchao\ϼ\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm index 38f0800..84f774d 100644 --- a/复合检验管理/U_JYOrderCDOne.dfm +++ b/复合检验管理/U_JYOrderCDOne.dfm @@ -243,13 +243,14 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne object ToolButton12: TToolButton Left = 785 Top = 30 + AutoSize = True Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 904 + Left = 872 Top = 30 AutoSize = True Caption = #24322#24120#25968#25454 @@ -257,7 +258,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 991 + Left = 959 Top = 30 AutoSize = True Caption = #23548#20986 @@ -265,7 +266,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TBExportClick end object TBClose: TToolButton - Left = 1054 + Left = 1022 Top = 30 AutoSize = True Caption = #20851#38381 diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas index a6918fb..55cab5e 100644 --- a/复合检验管理/U_JYOrderCDOne.pas +++ b/复合检验管理/U_JYOrderCDOne.pas @@ -11,7 +11,20 @@ uses cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, - cxCurrencyEdit, MMSystem; + cxCurrencyEdit, MMSystem, 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 TfrmJYOrderCDOne = class(TForm) @@ -397,7 +410,7 @@ begin sql.Clear; sql.Add('select A.*,'); SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,'); - sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,'); + sql.Add('C.OrderNo,C.CustomerNoName,C.MPRTMF,C.MPRTKZ,B.*,'); sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); sql.Add('CDQty=(select count(X.MJID) from WFB_MJJY_CD X where X.MJID=A.MJID)'); SQL.Add('from WFB_MJJY A'); @@ -516,7 +529,7 @@ end; procedure TfrmJYOrderCDOne.TBRafreshClick(Sender: TObject); begin - Tv1.DataController.Filter.AutoDataSetFilter := false; + Tv1.DataController.Filter.AutoDataSetFilter := false; OrderNo.SetFocus; MovePanel2.Visible := True; MovePanel2.Refresh; @@ -1623,7 +1636,59 @@ begin Open; end; end; + if (trim(ComboBox1.Text) = 'ķ뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMDYDL_PY '); + SQL.Add('@ZRow =25'); + SQL.Add(',@Zcol =4'); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + ShowMessage(sql.text); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_HZ); + SInitCDSData20(ADOQueryTemp, CDS_HZ); + with ADOQueryPrint do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd_HZ '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@flag=''2'' '); + Open; + end; + end; + if (trim(ComboBox1.Text) = '𳬸ϳ') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMDYDL_HS '); + SQL.Add('@ZRow =25'); + SQL.Add(',@Zcol =4'); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + Open; + end; + SCreateCDS20(ADOQueryTemp, CDS_HZ); + SInitCDSData20(ADOQueryTemp, CDS_HZ); + + with ADOQueryPrint do + begin + Close; + sql.Clear; + sql.add('exec P_Do_PrintMd_HZ '); + sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@flag=''2'' '); + Open; + end; + end; if (trim(ComboBox1.Text) = '뵥(Ⱦɫ)') then begin with ADOQueryTemp do diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index 2fccc57..0256207 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -655,10 +655,10 @@ begin Th := LoadLibrary(Pchar(trim(DllName))); if Th > 0 then begin - try + try Tp := GetProcAddress(Th, 'CommOpen'); if Tp <> nil then - begin + begin Tf := TMyFunc(Tp); newh := Tf(self.Handle, 'Comm1', 500, 1); if newh < 1 then @@ -694,11 +694,11 @@ begin // closeCom(FComFile); Th := LoadLibrary(Pchar(trim(DllNameT))); if Th > 0 then - begin - try - Tp := GetProcAddress(Th, 'CommOpen'); + begin + try + Tp := GetProcAddress(Th, 'CommOpen'); if Tp <> nil then - begin + begin Tf := TMyFunc(Tp); newh := Tf(self.Handle, 'Comm1', 500, 1); if newh < 1 then @@ -2688,7 +2688,7 @@ begin baoid.Text := FBaoID; Edit3.Text := ''; Edit4.Text := ''; - MJStr4.Text := ''; + MJStr4.Text := Trim(ADOTmp.fieldbyname('GangHao').AsString); end else begin