From ff5a18cd9529edf0f2562fb19c2547aada55e0af Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 12 Jul 2025 13:15:31 +0800 Subject: [PATCH] 3333 --- 云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.dfm | 64 ++++++++++++++------ 云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.pas | 4 +- 云翔生产管理(MYSC.dll)/U_LLRKMXInPut.dfm | 42 ++++++------- 云翔生产管理(MYSC.dll)/U_MCGRKList.dfm | 39 ++++++------ 云翔生产管理(MYSC.dll)/U_MCGRKList.pas | 1 + 5 files changed, 93 insertions(+), 57 deletions(-) diff --git a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.dfm b/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.dfm index 98fb22c..f97c485 100644 --- a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.dfm +++ b/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.dfm @@ -1,8 +1,8 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG - Left = 113 - Top = 116 - Width = 1414 - Height = 586 + Left = 421 + Top = 228 + Width = 1261 + Height = 492 Caption = #36741#26009#37319#36141#20837#24211#24405#20837 Color = clBtnFace Font.Charset = GB2312_CHARSET @@ -19,7 +19,7 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1398 + Width = 1253 Height = 30 ButtonHeight = 30 ButtonWidth = 145 @@ -118,8 +118,8 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG object Panel4: TPanel Left = 0 Top = 30 - Width = 1398 - Height = 517 + Width = 1253 + Height = 431 Align = alClient BevelInner = bvRaised BevelOuter = bvLowered @@ -295,7 +295,7 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG end object Label45: TLabel Left = 753 - Top = 244 + Top = 245 Width = 63 Height = 20 Caption = #31859#25968#37327 @@ -321,7 +321,7 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG end object Label10: TLabel Left = 624 - Top = 285 + Top = 284 Width = 42 Height = 20 Caption = #21305#38271 @@ -333,8 +333,8 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG ParentFont = False end object Label28: TLabel - Left = 892 - Top = 261 + Left = 900 + Top = 284 Width = 63 Height = 20 Caption = #37329#39069#65306 @@ -384,6 +384,19 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG Font.Style = [fsBold] ParentFont = False end + object Label6: TLabel + Left = 900 + Top = 245 + Width = 42 + Height = 20 + Caption = #21152#31859 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object CRTime: TDateTimePicker Tag = 2 Left = 680 @@ -640,7 +653,7 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG object PS: TEdit Tag = 2 Left = 668 - Top = 241 + Top = 242 Width = 74 Height = 25 Font.Charset = GB2312_CHARSET @@ -655,7 +668,7 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG object Qty: TEdit Tag = 2 Left = 817 - Top = 240 + Top = 242 Width = 75 Height = 25 Color = clMenu @@ -672,7 +685,7 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG object KgQty: TEdit Tag = 2 Left = 817 - Top = 280 + Top = 281 Width = 75 Height = 25 Font.Charset = GB2312_CHARSET @@ -701,8 +714,8 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG end object MYMDMoney: TEdit Tag = 2 - Left = 948 - Top = 257 + Left = 956 + Top = 280 Width = 109 Height = 28 Color = clMenu @@ -759,8 +772,8 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG TabOrder = 23 end object Button1: TButton - Left = 1076 - Top = 252 + Left = 1084 + Top = 276 Width = 85 Height = 37 Caption = #20462#25913#37329#39069 @@ -773,6 +786,21 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG TabOrder = 24 OnClick = Button1Click end + object AddQty: TEdit + Tag = 2 + Left = 956 + Top = 242 + Width = 74 + Height = 25 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -17 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 25 + OnChange = MDJChangChange + end end object ADOTemp: TADOQuery Connection = DataLink_MYSC.ADOLink diff --git a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.pas b/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.pas index a8f3308..bd05e59 100644 --- a/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.pas +++ b/云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.pas @@ -78,6 +78,8 @@ type Label5: TLabel; PMHH: TEdit; Button1: TButton; + AddQty: TEdit; + Label6: TLabel; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -752,7 +754,7 @@ end; procedure TfrmLLRKInPutMH_MCG.MDJChangChange(Sender: TObject); begin KgQty.Text := FormatFloat('0.00', strtofloatdef(MYKZ.text, 0) * strtofloatdef(MYMF.text, 0) * strtofloatdef(MDJChang.text, 0) * strtofloatdef(PS.text, 0) / 100000); - Qty.Text := FloatToStr(strtofloatdef(MDJChang.text, 0) * strtofloatdef(PS.text, 0)); + Qty.Text := FloatToStr(strtofloatdef(MDJChang.text, 0) * strtofloatdef(PS.text, 0) + strtofloatdef(AddQty.text, 0)); end; procedure TfrmLLRKInPutMH_MCG.Tv1DblClick(Sender: TObject); diff --git a/云翔生产管理(MYSC.dll)/U_LLRKMXInPut.dfm b/云翔生产管理(MYSC.dll)/U_LLRKMXInPut.dfm index 0cbe446..bb054cd 100644 --- a/云翔生产管理(MYSC.dll)/U_LLRKMXInPut.dfm +++ b/云翔生产管理(MYSC.dll)/U_LLRKMXInPut.dfm @@ -1,6 +1,6 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut - Left = 189 - Top = 136 + Left = 477 + Top = 184 Width = 1349 Height = 653 Caption = #26469#26009#26126#32454#30721#21333#24405#20837 @@ -206,7 +206,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 226 Top = 169 Width = 72 - Height = 38 + Height = 35 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -20 @@ -221,7 +221,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 125 Top = 160 Width = 36 - Height = 60 + Height = 54 Color = clMenuBar Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -237,7 +237,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 125 Top = 271 Width = 36 - Height = 60 + Height = 54 Color = clMenuBar Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -253,7 +253,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 125 Top = 67 Width = 174 - Height = 38 + Height = 35 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -20 @@ -266,7 +266,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 226 Top = 281 Width = 72 - Height = 38 + Height = 35 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -20 @@ -303,7 +303,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 616 Top = 179 Width = 100 - Height = 25 + Height = 23 Hint = 'MYTypeFlag' Color = clMenuBar Font.Charset = GB2312_CHARSET @@ -320,7 +320,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 614 Top = 90 Width = 123 - Height = 23 + Height = 21 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -13 @@ -334,7 +334,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 614 Top = 122 Width = 123 - Height = 23 + Height = 21 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -13 @@ -348,7 +348,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 614 Top = 58 Width = 123 - Height = 23 + Height = 21 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -13 @@ -362,7 +362,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 614 Top = 154 Width = 123 - Height = 23 + Height = 21 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -13 @@ -474,7 +474,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 63 Top = 9 Width = 36 - Height = 23 + Height = 21 Color = clMenuBar Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -490,7 +490,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 160 Top = 9 Width = 36 - Height = 23 + Height = 21 Color = clMenuBar Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -506,7 +506,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 272 Top = 9 Width = 64 - Height = 23 + Height = 21 Color = clMenuBar Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -522,7 +522,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 482 Top = 9 Width = 64 - Height = 23 + Height = 21 Color = clMenuBar Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -553,7 +553,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 372 Top = 9 Width = 49 - Height = 23 + Height = 21 Color = clMenuBar Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -569,7 +569,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 582 Top = 9 Width = 49 - Height = 23 + Height = 21 Color = clMenuBar Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -764,7 +764,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 409 Top = 19 Width = 69 - Height = 23 + Height = 21 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -13 @@ -778,7 +778,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 530 Top = 19 Width = 70 - Height = 23 + Height = 21 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -13 @@ -807,7 +807,7 @@ object frmLLRKMXInPut: TfrmLLRKMXInPut Left = 249 Top = 19 Width = 85 - Height = 23 + Height = 21 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -13 diff --git a/云翔生产管理(MYSC.dll)/U_MCGRKList.dfm b/云翔生产管理(MYSC.dll)/U_MCGRKList.dfm index 69ae544..9815ed8 100644 --- a/云翔生产管理(MYSC.dll)/U_MCGRKList.dfm +++ b/云翔生产管理(MYSC.dll)/U_MCGRKList.dfm @@ -1,6 +1,6 @@ object frmMCGRKList: TfrmMCGRKList - Left = 196 - Top = 105 + Left = 508 + Top = 193 Width = 1149 Height = 649 Caption = #26825#37319#36141#20837#24211#30331#35760 @@ -21,7 +21,6 @@ object frmMCGRKList: TfrmMCGRKList Left = 0 Top = 0 Width = 1141 - Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -87,12 +86,11 @@ object frmMCGRKList: TfrmMCGRKList AutoSize = True Caption = #21367#25968#31995#25968 ImageIndex = 25 - Wrap = True OnClick = ToolButton3Click end object labMYType: TLabel - Left = 0 - Top = 30 + Left = 474 + Top = 0 Width = 292 Height = 30 Caption = ' '#36741#26009#37319#36141#20837#24211' ' @@ -104,8 +102,8 @@ object frmMCGRKList: TfrmMCGRKList ParentFont = False end object ToolButton4: TToolButton - Left = 292 - Top = 30 + Left = 766 + Top = 0 AutoSize = True Caption = #25171#21360 ImageIndex = 4 @@ -113,16 +111,16 @@ object frmMCGRKList: TfrmMCGRKList OnClick = ToolButton4Click end object TBExport: TToolButton - Left = 361 - Top = 30 + Left = 835 + Top = 0 AutoSize = True Caption = #23548#20986 ImageIndex = 97 OnClick = TBExportClick end object TBClose: TToolButton - Left = 430 - Top = 30 + Left = 904 + Top = 0 AutoSize = True Caption = #20851#38381 ImageIndex = 21 @@ -131,9 +129,9 @@ object frmMCGRKList: TfrmMCGRKList end object cxGrid1: TcxGrid Left = 0 - Top = 139 + Top = 109 Width = 1141 - Height = 479 + Height = 509 Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 @@ -275,6 +273,13 @@ object frmMCGRKList: TfrmMCGRKList Styles.Footer = DataLink_MYSC.Default10 Width = 85 end + object Tv1Column2: TcxGridDBColumn + Caption = #22791#27880 + DataBinding.FieldName = 'Note' + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 87 + end object v1Column3: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Qty' @@ -318,7 +323,7 @@ object frmMCGRKList: TfrmMCGRKList end object Panel1: TPanel Left = 0 - Top = 62 + Top = 32 Width = 1141 Height = 77 Align = alTop @@ -705,8 +710,8 @@ object frmMCGRKList: TfrmMCGRKList end end object cxGroupBox2: TcxGroupBox - Left = 787 - Top = 121 + Left = 779 + Top = 169 Caption = #30721#21333'('#25991#20214')'#19978#20256 ParentColor = False ParentFont = False diff --git a/云翔生产管理(MYSC.dll)/U_MCGRKList.pas b/云翔生产管理(MYSC.dll)/U_MCGRKList.pas index c407ca7..1d07b5e 100644 --- a/云翔生产管理(MYSC.dll)/U_MCGRKList.pas +++ b/云翔生产管理(MYSC.dll)/U_MCGRKList.pas @@ -126,6 +126,7 @@ type MYMF: TComboBox; MYKZ: TComboBox; ToolButton3: TToolButton; + Tv1Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject);