From 6af181dcacddf1ed9aefc2d1b6fe78212049e655 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 4 Mar 2025 15:06:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=B8=E5=8F=B7=E4=BF=9D=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 打卷检验管理/TradeManage.dof | 2 +- 打卷检验管理/U_JYOrderCDOne.dfm | 71 ++++++------- 打卷检验管理/U_JYOrderCDOne.pas | 53 +++++----- 打卷检验管理/U_MJManageNewFDNew.dfm | 148 +++++++++++++++++++++++++++- 打卷检验管理/U_MJManageNewFDNew.pas | 71 ++++++++----- 5 files changed, 255 insertions(+), 90 deletions(-) diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index a2bef58..a6e8bfb 100644 --- a/打卷检验管理/TradeManage.dof +++ b/打卷检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\Сǿ\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJxiaoqiang\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index 4e7cbac..0738147 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 @@ -110,34 +110,35 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne AutoSize = True Caption = #25764#38144#20986#24211 ImageIndex = 86 + Wrap = True OnClick = ToolButton7Click end object ToolButton11: TToolButton - Left = 639 - Top = 0 + Left = 0 + Top = 30 Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 758 - Top = 0 + Left = 119 + Top = 30 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 869 - Top = 0 + Left = 230 + Top = 30 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 980 - Top = 0 + Left = 341 + Top = 30 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -145,16 +146,15 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 1103 - Top = 0 + Left = 464 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 - Wrap = True OnClick = ToolButton8Click end object ToolButton1: TToolButton - Left = 0 + Left = 575 Top = 30 AutoSize = True Caption = #25171#21360#26631#31614 @@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 87 + Left = 662 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 @@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 174 + Left = 749 Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 @@ -178,24 +178,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 273 + Left = 848 Top = 30 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 + Wrap = True OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 384 - Top = 30 + Left = 0 + Top = 60 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 447 - Top = 30 + Left = 63 + Top = 60 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -209,8 +210,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 515 - Top = 33 + Left = 131 + Top = 63 Width = 149 Height = 24 Style = csDropDownList @@ -234,8 +235,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 664 - Top = 30 + Left = 280 + Top = 60 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -248,32 +249,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 785 - Top = 30 + Left = 401 + Top = 60 Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 904 - Top = 30 + Left = 520 + Top = 60 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 991 - Top = 30 + Left = 607 + Top = 60 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 1054 - Top = 30 + Left = 670 + Top = 60 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -282,7 +283,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 62 + Top = 92 Width = 1384 Height = 88 Align = alTop @@ -805,9 +806,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 971ca2f..ec478f0 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -12,19 +12,19 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, 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; + 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) @@ -439,10 +439,9 @@ begin if Fieldbyname('ssel').AsBoolean then begin sumP := sumP + 1; - sumLen := RoundFloat(sumLen + Order_Main.fieldbyname('mjlen').AsFloat, 2); + sumLen := RoundFloat(sumLen + Order_Main.fieldbyname('mjlen').AsFloat, 2); sumMZ := RoundFloat(sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat, 2); - sumJZ := RoundFloat(sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat, 2) -// sumMZ := sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat; + sumJZ := RoundFloat(sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat, 2)// sumMZ := sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat; // sumJZ := sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat; end; @@ -681,7 +680,7 @@ procedure TfrmJYOrderCDOne.TBZFClick(Sender: TObject); begin if Order_Main.Locate('ssel', True, []) = False then begin - Application.MessageBox('ûѡ!', 'ʾ', 0); + Application.MessageBox('ûѡ!', 'ʾ', 0); Exit; end; if Application.MessageBox('ȷҪϺݲָܻ', 'ʾ', 32 + 4) <> IDYES then @@ -1134,8 +1133,8 @@ begin exit; end; try - Moudle := LoadLibrary('MakeQRBarcode.dll'); - @Makebar := GetProcAddress(Moudle, 'Make'); + Moudle := LoadLibrary('MakeQRBarcode.dll'); + @Makebar := GetProcAddress(Moudle, 'Make'); @Mixtext := GetProcAddress(Moudle, 'MixText'); Txt := Trim(Order_Main.fieldbyname('BaoID').AsString); fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp'; @@ -1157,6 +1156,8 @@ begin sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),'); sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), '); sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), '); + sql.Add('MJFK=DBO.F_Get_Order_SubStr(BaoID,''BNMJFK''), '); + sql.Add('MJSJKZ=DBO.F_Get_Order_SubStr(BaoID,''BNMJSJKZ''), '); sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), '); sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),'); sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), '); @@ -1177,7 +1178,7 @@ begin else begin ExportFtErpFile('ͨðǩ.rmf', ADOQueryCmd); - fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\ͨðǩ.rmf'; + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\ͨðǩ.rmf'; end; if FileExists(fPrintFile) then @@ -1437,7 +1438,7 @@ end; procedure TfrmJYOrderCDOne.ToolButton5Click(Sender: TObject); var fPrintFile, fPrintFile10, FMainID: string; - sqlStr: string; + sqlStr: string; begin // if (ComboBox1.ItemIndex = 4) and (Edit3.Text = '') then // begin @@ -1451,7 +1452,7 @@ begin exit; if Order_Main.Locate('SSel', True, []) = False then begin - Application.MessageBox('ûѡ', 'ʾ', 0); + Application.MessageBox('ûѡ', 'ʾ', 0); Exit; end; fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + trim(ComboBox1.Text) + '.rmf'; @@ -2280,7 +2281,7 @@ end; procedure TfrmJYOrderCDOne.ToolButton14Click(Sender: TObject); begin - if Order_Main.IsEmpty then + if Order_Main.IsEmpty then Exit; if Order_Main.Locate('SSel', True, []) = False then begin @@ -2324,7 +2325,7 @@ end; procedure TfrmJYOrderCDOne.ToolButton15Click(Sender: TObject); begin - if Order_Main.IsEmpty then + if Order_Main.IsEmpty then Exit; if Order_Main.Locate('SSel', True, []) = False then begin @@ -2345,7 +2346,7 @@ begin begin Close; sql.Clear; - sql.Add('Update WFB_MJJY Set TCZT=''δ'' '); + sql.Add('Update WFB_MJJY Set TCZT=''δ'' '); sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); ExecSQL; end; @@ -2361,7 +2362,7 @@ begin except ADOQueryCmd.Connection.RollbackTrans; Order_Main.EnableControls; - application.MessageBox('ݱʧܣ', 'ʾϢ', 0); + application.MessageBox('ݱʧܣ', 'ʾϢ', 0); end; end; diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm index 7fe52d8..8a664c5 100644 --- a/打卷检验管理/U_MJManageNewFDNew.dfm +++ b/打卷检验管理/U_MJManageNewFDNew.dfm @@ -973,11 +973,12 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = SpeedButton13Click end object Panel1: TPanel - Left = 0 - Top = 276 + Left = 344 + Top = 332 Width = 369 Height = 285 TabOrder = 0 + Visible = False object Button8: TButton Left = 5 Top = 4 @@ -1249,6 +1250,143 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF OnClick = Button26Click end end + object Panel4: TPanel + Left = 8 + Top = 256 + Width = 289 + Height = 265 + BevelInner = bvRaised + BevelOuter = bvLowered + Color = clSkyBlue + TabOrder = 1 + Visible = False + object SpeedButton21: TSpeedButton + Left = 5 + Top = 173 + Width = 69 + Height = 72 + Caption = 'G' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton30: TSpeedButton + Left = 96 + Top = 173 + Width = 70 + Height = 72 + Caption = 'H' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton39: TSpeedButton + Left = 187 + Top = 173 + Width = 70 + Height = 72 + Caption = 'I' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton44: TSpeedButton + Left = 5 + Top = 90 + Width = 69 + Height = 72 + Caption = 'D' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton48: TSpeedButton + Left = 96 + Top = 90 + Width = 70 + Height = 72 + Caption = 'E' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton58: TSpeedButton + Left = 187 + Top = 90 + Width = 70 + Height = 72 + Caption = 'F' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton67: TSpeedButton + Left = 5 + Top = 6 + Width = 69 + Height = 72 + Caption = 'A' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton76: TSpeedButton + Left = 96 + Top = 6 + Width = 70 + Height = 72 + Caption = 'B' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + object SpeedButton83: TSpeedButton + Left = 187 + Top = 6 + Width = 70 + Height = 72 + Caption = 'C' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -37 + Font.Name = #40657#20307 + Font.Style = [] + ParentFont = False + OnClick = SpeedButton1Click + end + end end object Panel2: TPanel Left = 428 @@ -2413,7 +2551,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel3: TPanel Left = 638 - Top = 328 + Top = 326 Width = 353 Height = 334 BevelInner = bvRaised @@ -3251,8 +3389,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Enabled = False Interval = 5000 OnTimer = Timer1Timer - Left = 960 - Top = 576 + Left = 1000 + Top = 472 end object ADOQueryPrint: TADOQuery Connection = DataLink_TradeManage.ADOLink diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas index b361527..268f68a 100644 --- a/打卷检验管理/U_MJManageNewFDNew.pas +++ b/打卷检验管理/U_MJManageNewFDNew.pas @@ -285,6 +285,16 @@ type CC: TEdit; Label54: TLabel; CZ: TEdit; + Panel4: TPanel; + SpeedButton21: TSpeedButton; + SpeedButton30: TSpeedButton; + SpeedButton39: TSpeedButton; + SpeedButton44: TSpeedButton; + SpeedButton48: TSpeedButton; + SpeedButton58: TSpeedButton; + SpeedButton67: TSpeedButton; + SpeedButton76: TSpeedButton; + SpeedButton83: TSpeedButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -599,7 +609,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -1278,7 +1288,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -1957,7 +1967,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -2636,7 +2646,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -3315,7 +3325,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -3994,7 +4004,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -4673,7 +4683,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -5352,7 +5362,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -6031,7 +6041,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -6710,7 +6720,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -7389,7 +7399,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -8068,7 +8078,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -8747,7 +8757,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -9426,7 +9436,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -10105,7 +10115,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -10784,7 +10794,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -11463,7 +11473,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -12142,7 +12152,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -12667,6 +12677,8 @@ begin sql.Add('KHORDERNO=DBO.F_Get_Order_SubStr(BaoID,''BNKHORDERNO''), '); sql.Add('PRTCODENAME=DBO.F_Get_Order_SubStr(BaoID,''BNPRTCODENAME''), '); sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), '); + sql.Add('MJFK=DBO.F_Get_Order_SubStr(BaoID,''BNMJFK''), '); + sql.Add('MJSJKZ=DBO.F_Get_Order_SubStr(BaoID,''BNMJSJKZ''), '); sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), '); sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),'); sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), '); @@ -13313,8 +13325,8 @@ begin end else begin - maxno := Trim(FMJID); - Edit; + maxno := Trim(FMJID); + Edit; end; FieldByName('MainId').value := Trim(FMainId); FieldByName('SubId').value := Trim(FSubId); @@ -13353,7 +13365,7 @@ begin FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0); FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0); FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0); -// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; +// FieldByName('MJQty4').Value := StrToFloatdef(trim(MJQty4.Text), 0) + fjZ; FieldByName('CC').Value := StrToFloatdef(trim(CC.Text), 1); FieldByName('CZ').Value := StrToFloatdef(trim(CZ.Text), 1); FieldByName('MJQty4').Value := format('%.' + trim(fxsws1) + 'f', [StrToFloatdef(trim(MJQty4.Text), 0) * StrToFloatdef(trim(CZ.Text), 1) + fjZ]); @@ -14620,13 +14632,13 @@ end; procedure TfrmMJManageNewFDNewSF.Label9Click(Sender: TObject); begin - if trim(Label9.Caption) = 'M' then + if trim(Label9.Caption) = 'M' then begin Label9.Caption := 'Y'; Label19.Caption := 'Y'; Label20.Caption := 'Y'; Label7.Caption := 'Y'; - end + end else begin Label9.Caption := 'M'; @@ -14879,6 +14891,17 @@ begin end; end; end; + Panel4.Visible := True; + with Panel4 do + begin + for i := 0 to ControlCount - 1 do + begin + if Controls[i] is TSpeedButton then + begin + TSpeedButton(Controls[i]).Hint := Trim(TEdit(Sender).Name); + end; + end; + end; end; procedure TfrmMJManageNewFDNewSF.MJLenChange(Sender: TObject); @@ -15117,6 +15140,8 @@ begin sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),'); sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), '); sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), '); + sql.Add('MJFK=DBO.F_Get_Order_SubStr(BaoID,''BNMJFK''), '); + sql.Add('MJSJKZ=DBO.F_Get_Order_SubStr(BaoID,''BNMJSJKZ''), '); sql.Add('KHORDERNO=DBO.F_Get_Order_SubStr(BaoID,''BNKHORDERNO''), '); sql.Add('PRTCODENAME=DBO.F_Get_Order_SubStr(BaoID,''BNPRTCODENAME''), '); sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');