diff --git a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof index 61febf3..1d9fee8 100644 --- a/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof +++ b/染整计划(DyeingFinishingPlan.dll)/DyeingFinishingPlan.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\ÈýË®\ȾÕû¼Æ»®(DyeingFinishingPlan.dll)\testDll.exe +HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\D7lmSanshui\ȾÕû¼Æ»®(DyeingFinishingPlan.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg b/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg index 7c050f6..9186cf8 100644 --- a/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg +++ b/染整计划(DyeingFinishingPlan.dll)/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = testDll.exe ProductPrice.dll +PROJECTS = DyeingFinishingPlan.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ +DyeingFinishingPlan.dll: DyeingFinishingPlan.dpr + $(DCC) + testDll.exe: testDll.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr - $(DCC) - diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm index ca36814..ddb64e4 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm @@ -21,7 +21,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 794 Top = 85 Width = 241 - Height = 600 + Height = 592 Align = alLeft TabOrder = 1 object SpeedButton13: TSpeedButton @@ -478,7 +478,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 0 Top = 85 Width = 369 - Height = 600 + Height = 592 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -1047,7 +1047,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 1035 Top = 85 Width = 0 - Height = 600 + Height = 592 Align = alClient BevelInner = bvRaised BevelOuter = bvLowered @@ -1056,7 +1056,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 2 Top = 2 Width = 524 - Height = 271 + Height = 263 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -1148,7 +1148,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object Panel8: TPanel Left = 2 - Top = 273 + Top = 265 Width = 524 Height = 41 Align = alBottom @@ -1164,7 +1164,7 @@ object frmMarkingInspection: TfrmMarkingInspection end object AOrdDefNote1: TRichEdit Left = 2 - Top = 314 + Top = 306 Width = 524 Height = 284 Align = alBottom @@ -1440,7 +1440,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 786 Top = 85 Width = 8 - Height = 600 + Height = 592 HotZoneClassName = 'TcxMediaPlayer9Style' Control = Panel1 end @@ -1448,7 +1448,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 369 Top = 85 Width = 417 - Height = 600 + Height = 592 Align = alLeft Caption = 'Panel1' TabOrder = 7 @@ -1456,7 +1456,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 1 Top = 1 Width = 415 - Height = 598 + Height = 590 Align = alClient TabOrder = 0 object Tv3: TcxGridDBTableView diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas index ab88dc2..0ac06da 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas @@ -28,7 +28,7 @@ uses type TfrmMarkingInspection = class(TForm) cxStyleRepository1: TcxStyleRepository; - cxStyle1: TcxStyle; + cxStyle1: TcxStyle; cxStyle2: TcxStyle; cxGridPopupMenu1: TcxGridPopupMenu; DataSource1: TDataSource; @@ -451,7 +451,7 @@ begin begin Close; SQL.Clear; - sql.Add(' exec P_Print_RKMDGangNo '); + sql.Add(' exec P_Print_RKMDGangNo_W '); SQL.Add(' @RKOrdID=''' + Trim(MRKOrdID) + ''''); Open; end; diff --git a/染整计划(DyeingFinishingPlan.dll)/testDll.dof b/染整计划(DyeingFinishingPlan.dll)/testDll.dof index d454d72..cb62f81 100644 --- a/染整计划(DyeingFinishingPlan.dll)/testDll.dof +++ b/染整计划(DyeingFinishingPlan.dll)/testDll.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\selfware_83398\selfware\Âí¹ú¸Ö¿ª·¢´úÂë\ÏîÄ¿´úÂë\self\Å÷²¼Âëµ¥´ý¼ìDDMD.dll)\testDll.exe +HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\D7lmSanshui\ȾÕû¼Æ»®(DyeingFinishingPlan.dll)\testDll.exe Launcher= UseLauncher=0 DebugCWD=