diff --git a/应收应付/U_DataLink.pas b/应收应付/U_DataLink.pas index c8fa28b..b443cb0 100644 --- a/应收应付/U_DataLink.pas +++ b/应收应付/U_DataLink.pas @@ -4,7 +4,21 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, - Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses; + Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, 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; var DConString:String; {ȫַ} server, dtbase, user, pswd: String; {ݿӲ} diff --git a/应收应付/U_GetDllForm.pas b/应收应付/U_GetDllForm.pas index 7690165..b15f5e6 100644 --- a/应收应付/U_GetDllForm.pas +++ b/应收应付/U_GetDllForm.pas @@ -17,7 +17,7 @@ uses U_YSCRJZC, U_YSCR_Gd, U_SKCR_Gd, U_YFZDList_MX, U_YSZDList_MX, U_YFMXlist, U_YSMXlist, U_YFCRMXList, U_FDINVOICE, U_FPINVOICE_TJ, U_FDINVOICE_X, U_FDINVOICE_XMX, U_FDINVOICE_S, U_YF_Money_LL, U_YF_Money_LL_list, - U_XXFPINVOICE_TJ, U_CostCR, U_YSCRMXList, U_FDINVOICE_JMX, U_XXFPINVOICE_TJD; + U_XXFPINVOICE_TJ, U_CostCR, U_YSCRMXList, U_FDINVOICE_JMX; ///////////////////////////////////////////////////////////////// // ˵:ȡDllеô // @@ -451,26 +451,26 @@ begin // mnewHandle := frmXXFPInvoice_TJ.Handle; end; - 422: //ƱͳƲѯ(Ȩ) - begin - if frmXXFPInvoice_TJd = nil then - begin - frmXXFPInvoice_TJd := TfrmXXFPInvoice_TJd.Create(application.MainForm); - with frmXXFPInvoice_TJd do - begin - fInvoiceFlag := '1'; - caption := Trim(Title); - FormStyle := mstyle; - windowState := mstate; - BorderStyle := mborderstyle; - //show; - end; - end - else - frmXXFPInvoice_TJd.BringToFront; - // - mnewHandle := frmXXFPInvoice_TJd.Handle; - end; +// 422: //ƱͳƲѯ(Ȩ) +// begin +// if frmXXFPInvoice_TJd = nil then +// begin +// frmXXFPInvoice_TJd := TfrmXXFPInvoice_TJd.Create(application.MainForm); +// with frmXXFPInvoice_TJd do +// begin +// fInvoiceFlag := '1'; +// caption := Trim(Title); +// FormStyle := mstyle; +// windowState := mstate; +// BorderStyle := mborderstyle; +// //show; +// end; +// end +// else +// frmXXFPInvoice_TJd.BringToFront; +// // +// mnewHandle := frmXXFPInvoice_TJd.Handle; +// end; 511: //õǼ begin diff --git a/应收应付/U_XXFPINVOICE_TJ.pas b/应收应付/U_XXFPINVOICE_TJ.pas index df32175..443417f 100644 --- a/应收应付/U_XXFPINVOICE_TJ.pas +++ b/应收应付/U_XXFPINVOICE_TJ.pas @@ -13,7 +13,20 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - DateUtils; + DateUtils, 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 TfrmXXFPInvoice_TJ = class(TForm) diff --git a/应收应付/U_YFMXlist.pas b/应收应付/U_YFMXlist.pas index df5c63a..b3f84af 100644 --- a/应收应付/U_YFMXlist.pas +++ b/应收应付/U_YFMXlist.pas @@ -14,7 +14,21 @@ uses IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDropDownEdit, RM_e_Xls, cxGridBandedTableView, cxGridDBBandedTableView, BtnEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, - cxNavigator, dxBarBuiltInMenu, cxCurrencyEdit, DateUtils; + cxNavigator, dxBarBuiltInMenu, cxCurrencyEdit, DateUtils, 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 TfrmYFMXlist = class(TForm) diff --git a/应收应付/U_YSMXlist.pas b/应收应付/U_YSMXlist.pas index 3700e0e..f3abb14 100644 --- a/应收应付/U_YSMXlist.pas +++ b/应收应付/U_YSMXlist.pas @@ -14,7 +14,20 @@ uses IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDropDownEdit, RM_e_Xls, cxGridBandedTableView, cxGridDBBandedTableView, BtnEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, - cxNavigator, dxBarBuiltInMenu, cxCurrencyEdit, cxCalc, DateUtils; + cxNavigator, dxBarBuiltInMenu, cxCurrencyEdit, cxCalc, DateUtils, 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 TfrmYSMXlist = class(TForm) @@ -215,7 +228,7 @@ procedure TfrmYSMXlist.ToolButton1Click(Sender: TObject); begin if ADOQueryMain.IsEmpty then Exit; - TcxGridToExcel(self.Caption + '-' + trim(factoryName.Text), cxgrid2); + TcxGridToExcel(self.Caption + '-' + StringReplace(trim(factoryName.Text), '/', '&', [rfReplaceAll]), cxgrid2); end; procedure TfrmYSMXlist.OrderNoChange(Sender: TObject); diff --git a/应收应付/YSYF.dof b/应收应付/YSYF.dof index cfefe0e..47d8461 100644 --- a/应收应付/YSYF.dof +++ b/应收应付/YSYF.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\Ҷ\ӦӦ\testDll.exe +HostApplication=D:\D7W\Ŀ\D7szYidui\ӦӦ\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/应收应付/YSYF.dpr b/应收应付/YSYF.dpr index 85406f3..84591f5 100644 --- a/应收应付/YSYF.dpr +++ b/应收应付/YSYF.dpr @@ -6,6 +6,7 @@ uses forms, WinTypes, WinProcs, + midaslib, U_DataLink in 'U_DataLink.pas' {DataLink_YSYF: TDataModule}, U_GetDllForm in 'U_GetDllForm.pas', U_ZDYHelpSel in '..\Z99Dependency\ThreeFun\Form\U_ZDYHelpSel.pas' {frmZDYHelpSel}, @@ -37,7 +38,7 @@ uses U_BpGdCklist in 'U_BpGdCklist.pas' {frmBpGdCklist}, U_YSSCList in 'U_YSSCList.pas' {frmYSSCList}, U_ProductOrderListSel in 'U_ProductOrderListSel.pas' {frmProductOrderListSel}, - U_XXFPINVOICE_TJD in '..\..\..\..\־\Ŀ\\ͳƲѯ(Statistics.dll)\U_XXFPINVOICE_TJD.pas' {frmXXFPInvoice_TJd}, +// U_XXFPINVOICE_TJD in '..\..\..\..\־\Ŀ\\ͳƲѯ(Statistics.dll)\U_XXFPINVOICE_TJD.pas' {frmXXFPInvoice_TJd}, U_FDINVOICE_S in 'U_FDINVOICE_S.pas' {frmFDINVOICE_S}, U_FDINVOICE_Sub_S in 'U_FDINVOICE_Sub_S.pas' {FrmInvoice_Sub_S}, U_Fun in '..\Z99Dependency\ThreeFun\Fun\U_Fun.pas', @@ -58,7 +59,7 @@ uses {$R *.res} -procedure DllEnterPoint(dwReason: DWORD);far;stdcall; +procedure DllEnterPoint(dwReason: DWORD); far; stdcall; begin DLLProc := @DLLEnterPoint; DllEnterPoint(DLL_PROCESS_ATTACH); @@ -69,14 +70,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/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof b/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof index 8b2c144..40ae371 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof +++ b/成品仓库(FinishedClothWarehouse.dll)/FinishedClothWarehouse.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=E:\Ŀ\02_֯\Ҷ\D7szYidui\Ʒֿ(FinishedClothWarehouse.dll)\testDll.exe +HostApplication=D:\D7W\Ŀ\D7szYidui\Ʒֿ(FinishedClothWarehouse.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/成品仓库(FinishedClothWarehouse.dll)/U_CPSQSMCK.pas b/成品仓库(FinishedClothWarehouse.dll)/U_CPSQSMCK.pas index 811281b..9196382 100644 --- a/成品仓库(FinishedClothWarehouse.dll)/U_CPSQSMCK.pas +++ b/成品仓库(FinishedClothWarehouse.dll)/U_CPSQSMCK.pas @@ -9,21 +9,20 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, BtnEdit, ShellAPI, cxTextEdit, - cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, - dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, - dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, - dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, - dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, - dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + 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; + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, + dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, + dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust, + dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, + dxSkinscxPCPainter; type TfrmCPSQSMCK = class(TForm) @@ -304,8 +303,8 @@ begin sql.Add(' inner join JY_Cloth B on A.P_CODE=B.P_CODE '); sql.Add(' where A.FHMainID=''' + Trim(CKOrdNo.Text) + ''''); sql.Add(' and B.JYID=''' + Trim(FSMStr) + ''''); - SQL.Add('AND (CASE WHEN ISXZPH='''' then A.BatchNo else '''' end )=(CASE WHEN ISXZPH='''' then b.BatchNo else '''' end ) '); - SQL.Add('AND (CASE WHEN ISXZPH='''' then A.WXPH else '''' end )=(CASE WHEN ISXZPH='''' then B.WXPH else '''' end ) '); + SQL.Add('AND (CASE WHEN ISXZPH='''' then isnull(A.BatchNo,'''') else '''' end )=(CASE WHEN ISXZPH='''' then isnull(b.BatchNo,'''') else '''' end ) '); + SQL.Add('AND (CASE WHEN ISXZPH='''' then isnull(A.WXPH,'''') else '''' end )=(CASE WHEN ISXZPH='''' then isnull(B.WXPH,'''') else '''' end ) '); // SQL.Add('and A.BatchNo = B.BatchNo and A.WXPH =B.WXPH'); // showmessage(sql.text); Open;