From 1318a8391747be5d8b6575f3e47a656e794f2f0b Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 5 Feb 2026 17:10:13 +0800 Subject: [PATCH] ~ --- 复合检验管理/U_GetDllForm.pas | 2 +- 复合检验管理/U_JYOrderCDOne.dfm | 74 ++++++++++++------------ 复合检验管理/U_MJManageNewFDNew.dfm | 4 +- 复合检验管理/U_MJManageNewFDNew.pas | 39 ++++++++++++- 复合检验管理/U_ProductOrderLBNameSet.dfm | 1 - 复合检验管理/U_ProductOrderLBNameSet.pas | 18 +++++- 6 files changed, 93 insertions(+), 45 deletions(-) diff --git a/复合检验管理/U_GetDllForm.pas b/复合检验管理/U_GetDllForm.pas index e0190df..807e10f 100644 --- a/复合检验管理/U_GetDllForm.pas +++ b/复合检验管理/U_GetDllForm.pas @@ -1,7 +1,7 @@ unit U_GetDllForm; interface - + uses Windows, Messages, forms, OleCtnrs, DateUtils, SysUtils, ADODB, inifiles, dxCore, ActiveX; diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm index 6c776ee..f5ef06c 100644 --- a/复合检验管理/U_JYOrderCDOne.dfm +++ b/复合检验管理/U_JYOrderCDOne.dfm @@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Left = 0 Top = 0 Width = 1384 - Height = 62 + Height = 92 AutoSize = True ButtonHeight = 30 ButtonWidth = 119 @@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 0 Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 + Wrap = True OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 608 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 719 - Top = 0 + Left = 111 + Top = 30 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 830 - Top = 0 + Left = 222 + Top = 30 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -129,23 +130,22 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 953 - Top = 0 + Left = 345 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 OnClick = ToolButton8Click end object ToolButton14: TToolButton - Left = 1064 - Top = 0 + Left = 456 + Top = 30 Caption = #25209#37327#20462#25913#31995#25968 ImageIndex = 54 - Wrap = True OnClick = ToolButton14Click end object ToolButton1: TToolButton - Left = 0 + Left = 575 Top = 30 AutoSize = True Caption = #25171#21360#26631#31614 @@ -153,42 +153,42 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 87 + Left = 662 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 ImageIndex = 57 - Visible = False OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 174 + Left = 749 Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 ImageIndex = 12 + Wrap = True Visible = False OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 273 - Top = 30 + Left = 0 + Top = 60 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 384 - Top = 30 + Left = 111 + Top = 60 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 447 - Top = 30 + Left = 174 + Top = 60 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -202,8 +202,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 515 - Top = 33 + Left = 242 + Top = 63 Width = 149 Height = 24 Style = csDropDownList @@ -227,8 +227,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 664 - Top = 30 + Left = 391 + Top = 60 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -241,32 +241,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 785 - Top = 30 + Left = 512 + Top = 60 Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 904 - Top = 30 + Left = 631 + Top = 60 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 991 - Top = 30 + Left = 718 + Top = 60 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 1054 - Top = 30 + Left = 781 + Top = 60 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -275,7 +275,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 62 + Top = 92 Width = 1384 Height = 88 Align = alTop @@ -821,9 +821,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 150 + Top = 180 Width = 1384 - Height = 568 + Height = 538 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm index 0c9dafd..49b945b 100644 --- a/复合检验管理/U_MJManageNewFDNew.dfm +++ b/复合检验管理/U_MJManageNewFDNew.dfm @@ -3214,8 +3214,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end end object ScrollBox2: TScrollBox - Left = -176 - Top = 312 + Left = -456 + Top = 656 Width = 481 Height = 569 Font.Charset = GB2312_CHARSET diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index 8059f00..589c80e 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -1810,10 +1810,45 @@ begin begin for i := 0 to fRoll.Count - 1 do begin - PrtData(fRoll.Strings[i]); + PrtData(fRoll.Strings[i]); end; end; + if (Trim(Edit6.Text) = '') and (strtointdef(Edit14.Text, 1) = 1 )then + begin + if (fbaotype = 'ֶ') or (fbaotype = '') then + begin + end + else + begin + with ADOCmd do + begin + Close; + sql.Clear; + sql.Add('exec P_View_Baoid ''' + trim(FFFMJID) + ''' '); + sql.Add(',''' + trim(FMainId) + ''' ,''' + trim(FSubId) + ''' '); + if fbaotype = '' then + begin + sql.Add(' ,1 '); + end; + if fbaotype = 'ɫ' then + begin + sql.Add(' ,2 '); + end; + if fbaotype = 'ɫ' then + begin + sql.Add(' ,3 '); + end; + Open; + end; + + if trim(ADOCmd.FieldByName('baoid').AsString) <> '' then + begin + PrtBaoData(ADOCmd.fieldbyname('baoid').AsString); + end; + end; + + end; MJMaoZ.Text := ''; MJQty1.Text := ''; MJQty2.Text := ''; @@ -2577,7 +2612,7 @@ var begin fRollType := ''; with ADOTmp do - begin + begin Close; sql.Clear; sql.Add('select B.*,B.OrderNo OrderNoM,C.*, '); diff --git a/复合检验管理/U_ProductOrderLBNameSet.dfm b/复合检验管理/U_ProductOrderLBNameSet.dfm index da4fc82..b52cc8d 100644 --- a/复合检验管理/U_ProductOrderLBNameSet.dfm +++ b/复合检验管理/U_ProductOrderLBNameSet.dfm @@ -86,7 +86,6 @@ object frmProductOrderLBNameSet: TfrmProductOrderLBNameSet AutoSize = True Caption = #21253#26631#31614#35774#32622 ImageIndex = 60 - Visible = False OnClick = ToolButton4Click end object ToolButton3: TToolButton diff --git a/复合检验管理/U_ProductOrderLBNameSet.pas b/复合检验管理/U_ProductOrderLBNameSet.pas index 30713c4..ecc9890 100644 --- a/复合检验管理/U_ProductOrderLBNameSet.pas +++ b/复合检验管理/U_ProductOrderLBNameSet.pas @@ -10,7 +10,21 @@ uses cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, StrUtils, Menus, cxDropDownEdit, - cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator; + cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, + 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 TfrmProductOrderLBNameSet = class(TForm) @@ -803,7 +817,7 @@ begin next; end; first; - EnableControls; + EnableControls; end; end;