From 7d59c726161b9ac44635f78e64acaa539f4330c0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 11 Dec 2025 15:12:43 +0800 Subject: [PATCH] 1234 --- 检验管理/TradeManage.dof | 2 +- 检验管理/TradeManage.dpr | 21 ++++++++++++--------- 检验管理/U_CpCkSaoMNewSel.dfm | 4 ++-- 检验管理/U_CpCkSaoMNewSel.pas | 25 +++++++++++++++++++------ 检验管理/U_OrderSel.dfm | 2 +- 检验管理/U_OrderSel.pas | 29 +++++++++++++++++++++-------- 6 files changed, 56 insertions(+), 27 deletions(-) diff --git a/检验管理/TradeManage.dof b/检验管理/TradeManage.dof index 3dc7ebb..a2893c8 100644 --- a/检验管理/TradeManage.dof +++ b/检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\֣ƽ\Ŀ\˳\\testDll.exe +HostApplication=D:\D7W\Ŀ\D7djRuishun\\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/检验管理/TradeManage.dpr b/检验管理/TradeManage.dpr index 7ab0d45..4ef9925 100644 --- a/检验管理/TradeManage.dpr +++ b/检验管理/TradeManage.dpr @@ -6,6 +6,7 @@ uses forms, WinTypes, WinProcs, + MidasLib, U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule}, U_GetDllForm in 'U_GetDllForm.pas', U_ZDYHelpSel in '..\..\..\ThreeFun\Form\U_ZDYHelpSel.pas' {frmZDYHelpSel}, @@ -55,7 +56,7 @@ uses {$R *.res} -procedure DllEnterPoint(dwReason: DWORD);far;stdcall; +procedure DllEnterPoint(dwReason: DWORD); far; stdcall; begin DLLProc := @DLLEnterPoint; DllEnterPoint(DLL_PROCESS_ATTACH); @@ -66,14 +67,16 @@ begin // if (Reason = DLL_PROCESS_DETACH) or (Reason=DLL_THREAD_DETACH) then // Application:=NewDllApp; end; -exports - GetDllForm; -begin - try - NewDllApp:=Application; - DLLProc := @DLLUnloadProc; - except - end; +exports + GetDllForm; + +begin + try + NewDllApp := Application; + DLLProc := @DLLUnloadProc; + except + + end; end. diff --git a/检验管理/U_CpCkSaoMNewSel.dfm b/检验管理/U_CpCkSaoMNewSel.dfm index ef5f76b..e83b57a 100644 --- a/检验管理/U_CpCkSaoMNewSel.dfm +++ b/检验管理/U_CpCkSaoMNewSel.dfm @@ -116,8 +116,8 @@ object frmCpCkSaoMNewSel: TfrmCpCkSaoMNewSel OnClick = Button2Click end object Button3: TButton - Left = 24 - Top = 130 + Left = 25 + Top = 131 Width = 70 Height = 20 Caption = #36873#21333 diff --git a/检验管理/U_CpCkSaoMNewSel.pas b/检验管理/U_CpCkSaoMNewSel.pas index 91802db..5ce8dac 100644 --- a/检验管理/U_CpCkSaoMNewSel.pas +++ b/检验管理/U_CpCkSaoMNewSel.pas @@ -9,7 +9,20 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, MMSystem, cxLookAndFeels, - cxLookAndFeelPainters, cxNavigator; + 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 TfrmCpCkSaoMNewSel = class(TForm) @@ -444,7 +457,7 @@ begin sql.Add(',AOrdDefstr1=(select AOrdDefstr1 from JYOrder_Sub_AnPai where ApId=A.ApId)'); sql.Add(',MJXH=(select MJXH from WFB_MJJY where MJID=A.MJID)'); sql.Add(',MJStr4=(select MJStr4 from WFB_MJJY where MJID=A.MJID)'); - sql.Add(' from CK_BanCP_CR A inner join CK_BanCP_KC B on A.CRID=B.CRID'); + sql.Add(' from CK_BanCP_CR A inner join CK_BanCP_KC B on A.mjid=B.mjid'); sql.Add(' where exists( select * from TBSubID AA where AA.SubId=A.SubId and AA.DName=''' + Trim(DCode) + ''') '); SQL.Add(' and (B.KCqty>0 OR B.KCKGQty>0) and A.CRType='''' '); Open; @@ -1104,10 +1117,10 @@ begin // ShowMessage(sql.Text); ExecSQL; end; - CDS_MainSel.EnableControls; - CDS_Main.EnableControls; - CDS_Sub.DisableControls; - ADOQueryCmd.Connection.CommitTrans; + CDS_MainSel.EnableControls; + CDS_Main.EnableControls; + CDS_Sub.DisableControls; + ADOQueryCmd.Connection.CommitTrans; RKOrdID.Text := ''; MovePanel2.Visible := False; JSbaoNum(); diff --git a/检验管理/U_OrderSel.dfm b/检验管理/U_OrderSel.dfm index 11babf8..be762f2 100644 --- a/检验管理/U_OrderSel.dfm +++ b/检验管理/U_OrderSel.dfm @@ -255,7 +255,7 @@ object frmOrderSel: TfrmOrderSel end object Button1: TButton Left = 847 - Top = 16 + Top = 17 Width = 75 Height = 25 Caption = #21047#26032 diff --git a/检验管理/U_OrderSel.pas b/检验管理/U_OrderSel.pas index 95ba9f5..f27bafe 100644 --- a/检验管理/U_OrderSel.pas +++ b/检验管理/U_OrderSel.pas @@ -9,7 +9,20 @@ uses cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, cxCheckBox, Menus, cxLookAndFeels, - cxLookAndFeelPainters, cxNavigator; + 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 TfrmOrderSel = class(TForm) @@ -164,20 +177,20 @@ begin sql.Add('select A.OrderNo,A.CustomerNoName,A.CustomerNo,'); sql.add('B.PRTCodeName,A.MainId,B.SubId,B.PRTColor,B.SOrddefstr1,B.OrderUnit,B.PRTOrderQty,B.PrtGangNo'); sql.Add(',B.PRTMF,B.PRTKZ,B.PRTHX'); - sql.Add(',ZPPS=(select Count(CR.MJID) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.CRID=KC.CRID'); + sql.Add(',ZPPS=(select Count(CR.MJID) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.MJID=KC.MJID'); sql.Add(' where CR.subid=B.subid and CR.CRType='''' and (KC.KCQty>0 or KCKGQty>0)and isnull(CPType,'''')<>''Ʒ'' ) '); - sql.Add(',ZPQty=(select sum(KCQty) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.CRID=KC.CRID'); + sql.Add(',ZPQty=(select sum(KCQty) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.MJID=KC.MJID'); sql.Add(' where CR.subid=B.subid and CR.CRType='''' and (KC.KCQty>0 or KCKGQty>0) and isnull(CPType,'''')<>''Ʒ'' ) '); - sql.Add(',ZPKGQty=(select sum(KCKGQty) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.CRID=KC.CRID '); + sql.Add(',ZPKGQty=(select sum(KCKGQty) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.MJID=KC.MJID '); sql.Add(' where CR.subid=B.subid and CR.CRType='''' and (KC.KCQty>0 or KCKGQty>0) and isnull(CPType,'''')<>''Ʒ'' ) '); - sql.Add(',CPPS=(select Count(CR.MJID) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.CRID=KC.CRID'); + sql.Add(',CPPS=(select Count(CR.MJID) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.MJID=KC.MJID'); sql.Add(' where CR.subid=B.subid and CR.CRType='''' and (KC.KCQty>0 or KCKGQty>0) and CPType=''Ʒ'') '); - sql.Add(',CPQty=(select sum(KCQty) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.CRID=KC.CRID'); + sql.Add(',CPQty=(select sum(KCQty) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.MJID=KC.MJID'); sql.Add(' where CR.subid=B.subid and CR.CRType='''' and (KC.KCQty>0 or KCKGQty>0) and CPType=''Ʒ'') '); - sql.Add(',CPKGQty=(select sum(KCKGQty) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.CRID=KC.CRID'); + sql.Add(',CPKGQty=(select sum(KCKGQty) from CK_BanCP_CR CR Inner join CK_BanCP_KC KC on CR.MJID=KC.MJID'); sql.Add(' where CR.subid=B.subid and CR.CRType='''' and (KC.KCQty>0 or KCKGQty>0) and CPType=''Ʒ'') '); sql.Add(' from JYOrder_Main A inner join jyorder_sub B on A.MainId=B.Mainid'); - sql.Add(' where exists(select AA.CRID from CK_BanCP_CR AA inner join CK_BanCP_KC BB on AA.CRID=BB.CRID '); + sql.Add(' where exists(select AA.CRID from CK_BanCP_CR AA inner join CK_BanCP_KC BB on AA.mjid=BB.mjid '); sql.Add(' where AA.MainId=A.MainId and AA.SubId=B.SubId and AA.CRType='''' and (BB.KCQty>0 or BB.KCKGQty>0))'); // sql.Add('order by cast(dbo.Get_ShuZi(B.SOrddefstr1) as bigint)'); // ShowMessage(sql.Text);