From c87a4e6b1e9f1992c860942bfd207bf3a041b834 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 19 Jul 2025 09:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A2=8B=20=20=20=E5=8F=AA?= =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E6=AF=9B=E9=87=8D=E4=B8=8D=E5=8A=A0=E5=87=80?= =?UTF-8?q?=E9=87=8D=E4=B8=8A=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 复合检验管理/U_JYOrderCDOne.dfm | 73 ++++++++++++------------ 复合检验管理/U_JYOrderCDOne.pas | 2 +- 复合检验管理/U_MJManageNewFDNew.dfm | 68 +++++++++++++++------- 复合检验管理/U_MJManageNewFDNew.pas | 10 ++-- 复合检验管理/U_ProductOrderLBNameSet.pas | 18 +++++- 5 files changed, 108 insertions(+), 63 deletions(-) diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm index 84f774d..1a69e6f 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,7 +153,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 87 + Left = 662 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 @@ -162,33 +162,34 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne 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 +203,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 +228,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,8 +242,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 785 - Top = 30 + Left = 512 + Top = 60 AutoSize = True Caption = #20462#25913#30721#21333 ImageIndex = 54 @@ -250,24 +251,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 872 - Top = 30 + Left = 599 + Top = 60 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 959 - Top = 30 + Left = 686 + Top = 60 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 1022 - Top = 30 + Left = 749 + Top = 60 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -276,7 +277,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 62 + Top = 92 Width = 1384 Height = 88 Align = alTop @@ -822,9 +823,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_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas index 55cab5e..a8d979d 100644 --- a/复合检验管理/U_JYOrderCDOne.pas +++ b/复合检验管理/U_JYOrderCDOne.pas @@ -1646,7 +1646,7 @@ begin SQL.Add('@ZRow =25'); SQL.Add(',@Zcol =4'); sql.add(',@DName=' + quotedstr(Trim(DCode))); - ShowMessage(sql.text); +// ShowMessage(sql.text); Open; end; SCreateCDS20(ADOQueryTemp, CDS_HZ); diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm index 4b10767..4a3b348 100644 --- a/复合检验管理/U_MJManageNewFDNew.dfm +++ b/复合检验管理/U_MJManageNewFDNew.dfm @@ -1065,7 +1065,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label3: TLabel Left = 144 - Top = 355 + Top = 382 Width = 26 Height = 22 Caption = 'cm' @@ -1104,7 +1104,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label6: TLabel Left = 8 - Top = 355 + Top = 387 Width = 42 Height = 20 Caption = #24133#23485 @@ -1130,7 +1130,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label10: TLabel Left = 8 - Top = 268 + Top = 300 Width = 42 Height = 20 Caption = #27491#21697 @@ -1143,7 +1143,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label12: TLabel Left = 92 - Top = 268 + Top = 300 Width = 40 Height = 19 Caption = #27425#21697 @@ -1197,7 +1197,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label22: TLabel Left = 144 - Top = 396 + Top = 416 Width = 36 Height = 22 Caption = 'g/'#13217 @@ -1210,7 +1210,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label23: TLabel Left = 8 - Top = 395 + Top = 420 Width = 42 Height = 20 Caption = #20811#37325 @@ -1237,7 +1237,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label26: TLabel Left = 8 - Top = 311 + Top = 343 Width = 42 Height = 20 Caption = #20986#32440 @@ -1316,7 +1316,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label34: TLabel Left = 90 - Top = 314 + Top = 346 Width = 40 Height = 19 Caption = #20221#25968 @@ -1355,7 +1355,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Label39: TLabel Left = 8 - Top = 221 + Top = 260 Width = 42 Height = 20 Caption = #31995#25968 @@ -1408,11 +1408,24 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False Visible = False end + object Label64: TLabel + Left = 9 + Top = 222 + Width = 63 + Height = 20 + Caption = #21253#35013#34955 + Font.Charset = ANSI_CHARSET + Font.Color = clBlue + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object MJFK: TEdit Left = 51 - Top = 349 + Top = 381 Width = 90 - Height = 41 + Height = 33 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 @@ -1458,7 +1471,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object BTPrint: TButton Left = 10 - Top = 432 + Top = 450 Width = 171 Height = 93 Caption = #25552#20132 @@ -1473,7 +1486,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit3: TEdit Left = 52 - Top = 262 + Top = 294 Width = 39 Height = 43 Font.Charset = GB2312_CHARSET @@ -1490,7 +1503,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit4: TEdit Left = 130 - Top = 262 + Top = 294 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -1523,9 +1536,9 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object MJSJKZ: TEdit Left = 51 - Top = 390 + Top = 415 Width = 90 - Height = 41 + Height = 33 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 @@ -1556,7 +1569,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Edit6: TEdit Left = 52 - Top = 305 + Top = 337 Width = 40 Height = 43 Font.Charset = GB2312_CHARSET @@ -1624,7 +1637,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object ComboBox1: TComboBox Left = 132 - Top = 306 + Top = 338 Width = 45 Height = 40 Style = csDropDownList @@ -1679,7 +1692,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object kmxs: TEdit Left = 57 - Top = 217 + Top = 256 Width = 90 Height = 36 Font.Charset = GB2312_CHARSET @@ -1736,7 +1749,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Button7: TButton Left = 10 - Top = 528 + Top = 549 Width = 171 Height = 53 Caption = #25171#21253#26631#31614 @@ -2012,6 +2025,21 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = Button13Click end end + object MJBZD: TEdit + Left = 73 + Top = 218 + Width = 90 + Height = 36 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -28 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 22 + OnClick = Edit1Click + OnKeyPress = MJstr3KeyPress + end end object MovePanel1: TMovePanel Left = 910 diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index 0256207..b3734e1 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -319,6 +319,8 @@ type Button11: TButton; Button12: TButton; Button13: TButton; + Label64: TLabel; + MJBZD: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -696,9 +698,9 @@ begin if Th > 0 then begin try - Tp := GetProcAddress(Th, 'CommOpen'); + Tp := GetProcAddress(Th, 'CommOpen'); if Tp <> nil then - begin + begin Tf := TMyFunc(Tp); newh := Tf(self.Handle, 'Comm1', 500, 1); if newh < 1 then @@ -1240,9 +1242,9 @@ begin end; if Trim(MJMaoZ.Text) <> '' then begin - FieldByName('MJMaoZ').Value := StrToFloat(MJMaoZ.Text) + fjz; + FieldByName('MJMaoZ').Value := StrToFloat(MJMaoZ.Text) + fjz + StrToFloatdef(trim(MJBZD.Text), 0); end; - if Trim(MJSJKZ.Text) <> '' then + if Trim(MJSJKZ.Text) <> '' then begin FieldByName('MJSJKZ').Value := MJSJKZ.Text; end; diff --git a/复合检验管理/U_ProductOrderLBNameSet.pas b/复合检验管理/U_ProductOrderLBNameSet.pas index 30713c4..f9579e1 100644 --- a/复合检验管理/U_ProductOrderLBNameSet.pas +++ b/复合检验管理/U_ProductOrderLBNameSet.pas @@ -1,7 +1,7 @@ unit U_ProductOrderLBNameSet; interface - + uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls, ToolWin, cxStyles, cxCustomData, @@ -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)