diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index 2481d4f..f200337 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\ŵ\\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJchennuo\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/检验管理/U_JYOrderCDOne.dfm b/检验管理/U_JYOrderCDOne.dfm index 5d5987a..36b049a 100644 --- a/检验管理/U_JYOrderCDOne.dfm +++ b/检验管理/U_JYOrderCDOne.dfm @@ -216,7 +216,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333'('#30721#25968')' #26816#39564#30721#21333'('#33394#21495')' #26816#39564#30721#21333'('#39068#33394#30133#28857')' - #26816#39564#30721#21333'('#32568#21495#30133#28857')') + #26816#39564#30721#21333'('#32568#21495#30133#28857')' + 'GB'#30721#21333) end object ToolButton9: TToolButton Left = 664 diff --git a/检验管理/U_JYOrderCDOne.pas b/检验管理/U_JYOrderCDOne.pas index 014862c..d6fafa5 100644 --- a/检验管理/U_JYOrderCDOne.pas +++ b/检验管理/U_JYOrderCDOne.pas @@ -427,7 +427,7 @@ begin end; label22.Caption := 'ƥ:' + floattostr(sumP); - label21.Caption := ':' + floattostr(sumLen); + label21.Caption := ':' + floattostr(sumLen); label20.Caption := 'ë:' + floattostr(sumMZ); label23.Caption := ':' + floattostr(sumJZ); Order_Main.Locate('mjid', fid, []); @@ -1124,9 +1124,9 @@ begin Order_Main.EnableControls; exit; end; - with ADOQueryPrint do + with ADOQueryPrint do begin - Close; + Close; SQL.Clear; sql.Add('select A.Baoid,A.BaoNo,A.MJTypeOther as QtyUnit,D.OrderNo,D.conNo,D.customerNoName,D.MprtCodeName,D.Mprtspec,D.OrdPerson1,D.MPRTKuanNO,D.LBName,D.NLBName,C.KHorderNo,'); sql.Add('PRTCodeName=DBO.F_Get_Order_SubStr(BaoID,''BNCodeName''),'); @@ -1137,7 +1137,7 @@ begin 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), '); sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), '); - SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty2) as MJQty2,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen'); + SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty2) as MJQty2,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen,SUM(A.MJLen1)as MJLen1'); sql.Add('from WFB_MJJY A'); sql.Add(' inner join JYOrder_Sub C on C.SubID=A.SubID'); sql.Add(' inner join JYOrder_Main D on D.MainID=A.MainID'); @@ -1752,7 +1752,7 @@ begin end; end; - if (trim(ComboBox1.Text) = '뵥(׺Ŵõ)') then + if (trim(ComboBox1.Text) = '뵥(׺Ŵõ)') or (trim(ComboBox1.Text) = 'GB뵥')then begin with ADOQueryTemp do begin diff --git a/检验管理/U_MJManageNewFDNew.dfm b/检验管理/U_MJManageNewFDNew.dfm index 0449bd5..bddfbde 100644 --- a/检验管理/U_MJManageNewFDNew.dfm +++ b/检验管理/U_MJManageNewFDNew.dfm @@ -22,7 +22,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 0 Top = 87 Width = 214 - Height = 620 + Height = 612 Align = alLeft TabOrder = 0 object Tv3: TcxGridDBTableView @@ -134,8 +134,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ScrollBox1: TScrollBox Left = 637 Top = 87 - Width = 721 - Height = 620 + Width = 713 + Height = 612 Align = alClient Color = clWhite ParentColor = False @@ -986,7 +986,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 428 Top = 87 Width = 209 - Height = 620 + Height = 612 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1985,7 +1985,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 214 Top = 87 Width = 214 - Height = 620 + Height = 612 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1994,7 +1994,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 2 Top = 2 Width = 210 - Height = 295 + Height = 287 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -2102,7 +2102,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object Panel8: TPanel Left = 2 - Top = 297 + Top = 289 Width = 210 Height = 28 Align = alBottom @@ -2117,7 +2117,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF end object AOrdDefNote1: TRichEdit Left = 2 - Top = 325 + Top = 317 Width = 210 Height = 293 Align = alBottom @@ -2330,7 +2330,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1358 + Width = 1350 Height = 30 AutoSize = True ButtonHeight = 30 @@ -2503,7 +2503,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF object Panel6: TPanel Left = 0 Top = 30 - Width = 1358 + Width = 1350 Height = 57 Align = alTop BevelInner = bvRaised diff --git a/检验管理/U_MJManageNewFDNew.pas b/检验管理/U_MJManageNewFDNew.pas index 0c1a09a..1552e10 100644 --- a/检验管理/U_MJManageNewFDNew.pas +++ b/检验管理/U_MJManageNewFDNew.pas @@ -10,7 +10,20 @@ 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, + 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 TfrmMJManageNewFDNewSF = class(TForm) @@ -1307,7 +1320,7 @@ begin end; //////////////////ظж end - else if fRollType = '޹' then + else if fRollType = '޹' then begin //////////////////ж // with ADOCmd do @@ -1346,7 +1359,7 @@ begin // if ADOCmd.IsEmpty then // begin // PlaySound('wav\.wav', 0, SND_FILENAME or SND_ASYNC); -// if Application.MessageBox('ţǷҪ!', 'ʾ', 32 + 4) <> IDYes then +// if Application.MessageBox('ţǷҪ!', 'ʾ', 32 + 4) <> IDYes then // begin // Result := False; // ADOCmd.Connection.RollbackTrans; @@ -1670,7 +1683,7 @@ begin // exit; // end; if Trim(Edit6.Text) <> '' then - begin + begin with ADOTmp do begin Close; @@ -1812,7 +1825,7 @@ begin 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), '); sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), '); - SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty2) as MJQty2,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen'); + SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty2) as MJQty2,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen,SUM(A.MJLen1)as MJLen1'); sql.Add('from WFB_MJJY A'); sql.Add('inner join JYOrder_Sub C on C.SubID=A.SubID'); sql.Add('inner join JYOrder_Main D on D.MainID=A.MainID'); @@ -2858,7 +2871,7 @@ begin 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), '); sql.Add('MprtCodeNameEng=(select top 1 Note from KH_Zdy X where X.zdyName=D.MprtCodeName), '); - SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty2) as MJQty2,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen'); + SQL.ADD('count(A.MJID) as JSl,sum(A.MJMaoZ) MJMAOZ,sum(MJQty2) as MJQty2,sum(MJQty3) as MJQty3,sum(MJQty4) as MJQty4,SUM(A.MJLen)as MJLen,SUM(A.MJLen1)as MJLen1'); sql.Add('from WFB_MJJY A'); sql.Add('inner join JYOrder_Sub C on C.SubID=A.SubID'); sql.Add('inner join JYOrder_Main D on D.MainID=A.MainID');