diff --git a/桂华管理系统/TradeManage.dof b/桂华管理系统/TradeManage.dof index 6bd2cb7..4d723ff 100644 --- a/桂华管理系统/TradeManage.dof +++ b/桂华管理系统/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\Ŀ\D7wmguihua\𻪹ϵͳ\testDll.exe +HostApplication=D:\D7W\Ŀ\D7wmguihua\𻪹ϵͳ\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/桂华管理系统/TradeManage.dpr b/桂华管理系统/TradeManage.dpr index 1e663d5..0b0f7e0 100644 --- a/桂华管理系统/TradeManage.dpr +++ b/桂华管理系统/TradeManage.dpr @@ -1,11 +1,12 @@ library TradeManage; uses - SysUtils, - classes, - forms, - WinTypes, + SysUtils, + classes, + forms, + WinTypes, WinProcs, + midaslib, U_DataLink in 'U_DataLink.pas' {DataLink_TradeManage: TDataModule}, U_GetDllForm in 'U_GetDllForm.pas', U_Fun in '..\..\..\ThreeFun\Fun\U_Fun.pas', @@ -68,7 +69,7 @@ uses {$R *.res} -procedure DllEnterPoint(dwReason: DWORD);far;stdcall; +procedure DllEnterPoint(dwReason: DWORD); far; stdcall; begin DLLProc := @DLLEnterPoint; DllEnterPoint(DLL_PROCESS_ATTACH); @@ -79,14 +80,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_ClothContractList.dfm b/桂华管理系统/U_ClothContractList.dfm index 0b6ef77..b0f62c0 100644 --- a/桂华管理系统/U_ClothContractList.dfm +++ b/桂华管理系统/U_ClothContractList.dfm @@ -661,6 +661,12 @@ object frmClothContractList: TfrmClothContractList Options.Editing = False Width = 80 end + object Tv1Column2: TcxGridDBColumn + Caption = #25209#27425#21495 + DataBinding.FieldName = 'batchno' + HeaderAlignmentHorz = taCenter + Width = 67 + end object Tv1Column1: TcxGridDBColumn Caption = #25104#21697#21697#21517 DataBinding.FieldName = 'CP_CodeName' diff --git a/桂华管理系统/U_ClothContractList.pas b/桂华管理系统/U_ClothContractList.pas index a8470ed..c0dfe41 100644 --- a/桂华管理系统/U_ClothContractList.pas +++ b/桂华管理系统/U_ClothContractList.pas @@ -11,7 +11,20 @@ uses cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxPC, cxCheckBox, cxCurrencyEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu; + dxBarBuiltInMenu, 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 TfrmClothContractList = class(TForm) @@ -112,6 +125,7 @@ type v1Column22: TcxGridDBColumn; v1Column23: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; + Tv1Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); diff --git a/桂华管理系统/U_OrdeFollower.dfm b/桂华管理系统/U_OrdeFollower.dfm index 86d9600..073b1ee 100644 --- a/桂华管理系统/U_OrdeFollower.dfm +++ b/桂华管理系统/U_OrdeFollower.dfm @@ -441,7 +441,7 @@ object frmOrdeFollower: TfrmOrdeFollower HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_TradeManage.Default - Width = 73 + Width = 74 end object v1Column5: TcxGridDBColumn Caption = #31614#35746#26085#26399 diff --git a/桂华管理系统/U_OrdeFollower_input.dfm b/桂华管理系统/U_OrdeFollower_input.dfm index 3843c64..ee7928a 100644 --- a/桂华管理系统/U_OrdeFollower_input.dfm +++ b/桂华管理系统/U_OrdeFollower_input.dfm @@ -128,7 +128,8 @@ object frmOrdeFollower_input: TfrmOrdeFollower_input #21040#36135 #35843#25320#20837#24211 #21378#20869#22238#20462 - #22238#20462) + #22238#20462 + #26399#21021#20837#24211) HeaderAlignmentHorz = taCenter Width = 60 end