From b787816d162b8564142c3cc0f717dfa25c8445ea Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 22 Jul 2025 14:25:36 +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 --- 复合检验管理/U_JYOrderCDOne.dfm | 8 +- 复合检验管理/U_JYOrderCDOne.pas | 120 +++++++++++++++++++++++++++- 复合检验管理/U_MJManageNewFDNew.dfm | 15 ++-- 复合检验管理/U_MJManageNewFDNew.pas | 14 ++-- 复合检验管理/U_OrderInPut.dfm | 16 +++- 复合检验管理/U_OrderInPut.pas | 53 +++++++++++- 6 files changed, 200 insertions(+), 26 deletions(-) diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm index ddb1c16..16c2932 100644 --- a/复合检验管理/U_JYOrderCDOne.dfm +++ b/复合检验管理/U_JYOrderCDOne.dfm @@ -2114,8 +2114,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne ClientRectTop = 0 end object Panel15: TPanel - Left = 656 - Top = 216 + Left = 944 + Top = 208 Width = 425 Height = 345 Color = clSkyBlue @@ -2608,8 +2608,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne LaterBuildEvents = True OnlyOwnerDataSet = False OnPrintReportEvent = RM1PrintReportEvent - Left = 368 - Top = 168 + Left = 376 + Top = 128 ReportData = {} end object RMXLSExport1: TRMXLSExport diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas index 8426667..1dc66a2 100644 --- a/复合检验管理/U_JYOrderCDOne.pas +++ b/复合检验管理/U_JYOrderCDOne.pas @@ -1687,7 +1687,54 @@ begin Open; end; end; + if (trim(ComboBox1.Text) = 'Īɭ뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMDYDL_hx '); + 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=''12'' '); + Open; + end; + end; + if (trim(ComboBox1.Text) = '½ΰ뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMDYDL_hx_SW '); + 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=''13'' '); + Open; + end; + end; if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥(ȡ)') or (trim(ComboBox1.Text) = '뵥') then begin with ADOQueryTemp do @@ -1746,6 +1793,40 @@ begin Open; end; end; + if (trim(ComboBox1.Text) = '˹뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMDYDL_YS '); + 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=''22'' '); + Open; + end; + with ADOQuery1 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 @@ -1771,10 +1852,10 @@ begin end; with ADOQuery1 do begin - Close; + Close; sql.Clear; sql.add('exec P_Do_PrintMd_HZ '); - sql.add('@mainID=' + quotedstr(Trim(''))); + sql.add('@mainID=' + quotedstr(Trim(''))); sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''2'' '); Open; @@ -1849,7 +1930,40 @@ begin Open; end; end; + if (trim(ComboBox1.Text) = 'ŵҫ뵥') then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + sql.add('exec P_Print_CKMDYDL_2L '); + 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; + with ADOQuery1 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 @@ -2086,7 +2200,7 @@ begin sql.Clear; sql.Add('Update WFB_MJJY Set MJQTY3=''' + trim(cxCurrencyEdit2.Text) + ''' '); sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); - sql.Add('Update WFB_MJJY Set MJMaoZ=MJQty4+MJQty3 '); + sql.Add('Update WFB_MJJY Set MJQty4=MJMaoZ-MJQty3 '); sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); ExecSQL; end; diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm index 438784e..7e3ef54 100644 --- a/复合检验管理/U_MJManageNewFDNew.dfm +++ b/复合检验管理/U_MJManageNewFDNew.dfm @@ -200,7 +200,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ScrollBox1: TScrollBox Left = 1639 Top = 87 - Width = 41 + Width = 281 Height = 717 Align = alClient Color = clWhite @@ -1555,7 +1555,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnChange = MJLenChange OnClick = Edit1Click OnKeyDown = MJQty4KeyDown - OnKeyPress = MJstr3KeyPress end object MJMaoZ: TEdit Left = 57 @@ -1703,7 +1702,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnChange = MJQty3Change OnClick = Edit1Click OnKeyDown = MJQty4KeyDown - OnKeyPress = MJstr3KeyPress end object MJQty4: TEdit Left = 57 @@ -1720,7 +1718,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnChange = MJQty4Change OnClick = Edit1Click OnKeyDown = MJQty4KeyDown - OnKeyPress = MJQty4KeyPress end object ComboBox1: TComboBox Left = 132 @@ -2446,8 +2443,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object MovePanel1: TMovePanel - Left = 910 - Top = 659 + Left = 1374 + Top = 787 Width = 339 Height = 236 BevelInner = bvLowered @@ -2848,8 +2845,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object Panel3: TPanel - Left = 858 - Top = 341 + Left = 1002 + Top = 517 Width = 353 Height = 334 BevelInner = bvRaised @@ -4231,7 +4228,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Timer1: TTimer Enabled = False - Interval = 5000 + Interval = 7000 OnTimer = Timer1Timer Left = 960 Top = 576 diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index 5b77840..2b9ff36 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -1,7 +1,7 @@ unit U_MJManageNewFDNew; interface - + uses Windows, Messages, SysUtils, Variants, math, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData, @@ -10,7 +10,7 @@ uses cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu, ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox, - MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI, + MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI, BtnEdit, FTComboBox, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, @@ -1299,13 +1299,13 @@ begin FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty5').Value := StrToFloatdef(trim(MJQty5.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); - FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + StrToFloatdef(trim(MJQty5.Text), 0) + fjZ; + FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0); //+ StrToFloatdef(trim(MJQty5.Text), 0) + fjZ FieldByName('MJMaoZ').Value := StrToFloatdef(trim(MJMaoZ.Text), 0) + StrToFloatdef(trim(MJQty5.Text), 0) + fjZ; // FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; if Trim(MJFK.Text) <> '' then begin - FieldByName('MJFK').Value := MJFK.Text; + FieldByName('MJFK').Value := MJFK.Text; end; // if Trim(MJMaoZ.Text) <> '' then // begin @@ -2583,7 +2583,7 @@ procedure TfrmMJManageNewFDNewSF.MJstr3KeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then begin - BTPrint.Click; +// BTPrint.Click; end; end; @@ -2832,7 +2832,7 @@ begin begin fType := '10'; if showmodal = 1 then - begin + begin Edit13.Text := ''; Panel4.Enabled := False; SLbName.Enabled := False; @@ -2847,7 +2847,7 @@ procedure TfrmMJManageNewFDNewSF.MJQty4KeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then begin - BTPrint.Click; +// BTPrint.Click; end; end; diff --git a/复合检验管理/U_OrderInPut.dfm b/复合检验管理/U_OrderInPut.dfm index e805771..9cd49e1 100644 --- a/复合检验管理/U_OrderInPut.dfm +++ b/复合检验管理/U_OrderInPut.dfm @@ -46,10 +46,18 @@ object frmOrderInPut: TfrmOrderInPut ImageIndex = 14 OnClick = TBSaveClick end - object TBClose: TToolButton + object ToolButton4: TToolButton Left = 63 Top = 0 AutoSize = True + Caption = #37325#36830 + ImageIndex = 56 + OnClick = ToolButton4Click + end + object TBClose: TToolButton + Left = 126 + Top = 0 + AutoSize = True Caption = #20851#38381 ImageIndex = 55 OnClick = TBCloseClick @@ -2003,4 +2011,10 @@ object frmOrderInPut: TfrmOrderInPut Left = 776 Top = 133 end + object QryCheckNet: TADOQuery + Connection = DataLink_TradeManage.ADOLink + Parameters = <> + Left = 92 + Top = 349 + end end diff --git a/复合检验管理/U_OrderInPut.pas b/复合检验管理/U_OrderInPut.pas index 8aa1300..fa3dc11 100644 --- a/复合检验管理/U_OrderInPut.pas +++ b/复合检验管理/U_OrderInPut.pas @@ -31,7 +31,7 @@ type TfrmOrderInPut = class(TForm) ToolBar1: TToolBar; TBSave: TToolButton; - TBClose: TToolButton; + TBClose: TToolButton; ScrollBox1: TScrollBox; Label1: TLabel; OrderNo: TEdit; @@ -197,6 +197,8 @@ type Tv1Column6: TcxGridDBColumn; Tv1Column7: TcxGridDBColumn; Tv1Column8: TcxGridDBColumn; + ToolButton4: TToolButton; + QryCheckNet: TADOQuery; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -229,6 +231,7 @@ type procedure v1SOrddefstr1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure v1PRTHXPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure ToolButton4Click(Sender: TObject); private procedure InitData(); procedure ZDYHelp(FButn: TcxButtonEdit; LType: string); @@ -240,6 +243,7 @@ type procedure CJEWM(); procedure InitImage(); procedure InitDataSetDictionary(); + function SelfConnData(): Boolean; { Private declarations } public PState, CopyInt, PriceFlag: Integer; @@ -435,6 +439,7 @@ begin OrderNo.Text := ''; orddefnote1.Text := ''; OrdPerson2.Text := trim(dName); + SLBName.text := ''; with Order_Sub do begin First; @@ -514,7 +519,7 @@ end; function TfrmOrderInPut.SaveData(): Boolean; var - maxno: string; + maxno: string; begin try @@ -1313,6 +1318,7 @@ begin First; while not Eof do begin + with Order_Sub do begin Append; @@ -1790,5 +1796,48 @@ begin end; end; +procedure TfrmOrderInPut.ToolButton4Click(Sender: TObject); +begin + if SelfConnData() = false then + begin + Application.MessageBox('ʧܣ±', 'ʾ', 0); + Exit; + end; +end; + +function TfrmOrderInPut.SelfConnData(): Boolean; +begin + try + with QryCheckNet do + begin + Close; + sql.Clear; + //ѯһС + SQL.Add('select getdate()'); + Open; + end; + Result := true; + except +// if Application.MessageBox('Ƿ磡','ʾ',32+4)<>IDYES then Exit; + if not Assigned(DataLink_TradeManage) then + DataLink_TradeManage := TDataLink_TradeManage.Create(Application); + try + with DataLink_TradeManage.ADOLink do + begin + //if not Connected then + begin + Connected := false; + ConnectionString := DConString; + LoginPrompt := false; + Connected := true; + end; + end; + Result := true; + except + Result := false; + end; + end; +end; + end.