diff --git a/A02基础产品管理/ClothInfo.dproj.local b/A02基础产品管理/ClothInfo.dproj.local index 5ed05e3..7bf8545 100644 --- a/A02基础产品管理/ClothInfo.dproj.local +++ b/A02基础产品管理/ClothInfo.dproj.local @@ -1,52 +1,52 @@  - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas - 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= + 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas - 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm - 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas + 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas= - 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899/12/30 00:00:00.000.228,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm + 1899/12/30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899/12/30 00:00:00.000.936,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A02基础产品管理\U_ClothInfoInput.pas 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899/12/30 00:00:00.000.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas - 1899/12/30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm + 1899/12/30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas + 1899/12/30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm 1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899/12/30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas + 1899/12/30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index 6616a4d..af5eba1 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -28,7 +28,6 @@ inherited frmClothInfo: TfrmClothInfo ParentColor = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 1444 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -169,7 +168,6 @@ inherited frmClothInfo: TfrmClothInfo Color = 16242829 ParentBackground = False TabOrder = 1 - ExplicitWidth = 1444 object Label11: TLabel Left = 1072 Top = 107 @@ -345,7 +343,6 @@ inherited frmClothInfo: TfrmClothInfo BevelOuter = bvLowered Caption = 'Panel3' TabOrder = 4 - ExplicitWidth = 1216 object Splitter1: TSplitter Left = 2 Top = 60 @@ -364,7 +361,6 @@ inherited frmClothInfo: TfrmClothInfo TabOrder = 0 ExplicitLeft = 6 ExplicitTop = 59 - ExplicitWidth = 1163 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -553,7 +549,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alTop BevelOuter = bvNone TabOrder = 1 - ExplicitWidth = 1212 object Panel4: TPanel Left = 0 Top = 0 @@ -562,7 +557,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alClient AutoSize = True TabOrder = 0 - ExplicitWidth = 1212 DesignSize = ( 1224 40) @@ -666,7 +660,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alBottom Caption = 'Panel9' TabOrder = 2 - ExplicitWidth = 1212 object Panel10: TPanel Left = 1 Top = 1 @@ -675,7 +668,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alClient Caption = 'Panel9' TabOrder = 0 - ExplicitWidth = 1210 object GroupBox1: TGroupBox Left = 1 Top = 42 @@ -684,7 +676,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alClient Caption = #26679#21697#32553#30053#22270#65288#21452#20987#22270#29255#26597#30475#21407#22270#65289 TabOrder = 0 - ExplicitWidth = 1208 object ScrollBox1: TScrollBox Left = 2 Top = 14 @@ -694,7 +685,6 @@ inherited frmClothInfo: TfrmClothInfo BevelInner = bvLowered BorderStyle = bsNone TabOrder = 0 - ExplicitWidth = 1204 end end object Panel11: TPanel @@ -705,7 +695,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alTop TabOrder = 1 Visible = False - ExplicitWidth = 1208 DesignSize = ( 1220 41) @@ -740,7 +729,6 @@ inherited frmClothInfo: TfrmClothInfo OnChange = cbbHXChange Items.Strings = ( #33457#22411) - ExplicitLeft = 368 end end end @@ -760,7 +748,6 @@ inherited frmClothInfo: TfrmClothInfo #24050#23457#26680 #20840#37096) OnChange = cxTabControl1Change - ExplicitWidth = 1212 ClientRectRight = 0 ClientRectTop = 0 end @@ -772,7 +759,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alRight TabOrder = 4 Visible = False - ExplicitLeft = 1168 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj.local b/F01染色坯布仓库/DyeGreyClothStk.dproj.local index e7422c7..c05bb81 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dproj.local +++ b/F01染色坯布仓库/DyeGreyClothStk.dproj.local @@ -1,46 +1,46 @@  - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas - 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.865,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899/12/30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas - 1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj + 1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas 1899/12/30 00:00:00.000.817,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899/12/30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.791,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm + 1899/12/30 00:00:00.000.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.278,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899/12/30 00:00:00.000.492,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 2025/08/29 17:00:58.000.253,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePlanForCardSel.pas 2025/09/29 17:18:11.000.618,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePBImport.pas 2025/10/13 14:35:20.000.136,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyeGreyClothStkStats.pas diff --git a/F01染色坯布仓库/DyeGreyClothStk.identcache b/F01染色坯布仓库/DyeGreyClothStk.identcache index 5b3f175..c02c9ea 100644 Binary files a/F01染色坯布仓库/DyeGreyClothStk.identcache and b/F01染色坯布仓库/DyeGreyClothStk.identcache differ diff --git a/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm b/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm index 1a06910..49592d3 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm +++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.dfm @@ -22,6 +22,7 @@ inherited frmDyeGreyClothInEdit: TfrmDyeGreyClothInEdit Height = 508 Align = alClient TabOrder = 0 + ExplicitTop = 44 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas index e122b5a..1f5a337 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInEdit.pas +++ b/F01染色坯布仓库/U_DyeGreyClothInEdit.pas @@ -788,15 +788,15 @@ end; procedure TfrmDyeGreyClothInEdit.Tv1OrderNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin - with ADOQueryTemp do - begin - close; - sql.Clear; - sql.Add('exec P_OrderCR'); - -// ShowMessage(sql.Text); - execsql; - end; +// with ADOQueryTemp do +// begin +// close; +// sql.Clear; +// sql.Add('exec P_OrderCR'); +// +//// ShowMessage(sql.Text); +// execsql; +// end; frmProductOrderListSel := TfrmProductOrderListSel.create(self); with frmProductOrderListSel do diff --git a/F01染色坯布仓库/U_DyePBImport.pas b/F01染色坯布仓库/U_DyePBImport.pas index 820e599..e21419c 100644 --- a/F01染色坯布仓库/U_DyePBImport.pas +++ b/F01染色坯布仓库/U_DyePBImport.pas @@ -173,6 +173,15 @@ begin sql.add(' where MainId = ' + quotedStr(Trim(CDS_1.fieldbyname('OrderNo').AsString))); open; end; + + with ADOQueryTemp do + begin + Close; + SQL.Clear; + SQL.Add('select * from BS_Cloth_Info where C_Name = ' + QuotedStr(Trim(ADOQueryCmd.fieldbyname('C_Name').asstring))); + Open; + end; + frmDyeGreyClothInEdit.CDS_Sub.edit; frmDyeGreyClothInEdit.CDS_Sub.FieldByName('OrderNo').Value := ADOQueryCmd.fieldbyname('OrderNo').asstring; frmDyeGreyClothInEdit.CDS_Sub.FieldByName('C_Name').Value := ADOQueryCmd.fieldbyname('C_Name').asstring; @@ -180,6 +189,12 @@ begin frmDyeGreyClothInEdit.CDS_Sub.FieldByName('F_Name').Value := ADOQueryCmd.fieldbyname('F_Name').asstring; frmDyeGreyClothInEdit.CDS_Sub.FieldByName('finishDescription').Value := ADOQueryCmd.fieldbyname('C_description').asstring; + + + frmDyeGreyClothInEdit.CDS_Sub.FieldByName('C_Width').Value := ADOQueryTemp.fieldbyname('C_Width').asstring; + frmDyeGreyClothInEdit.CDS_Sub.FieldByName('F_Width').Value := ADOQueryTemp.fieldbyname('F_Width').asstring; + frmDyeGreyClothInEdit.CDS_Sub.FieldByName('Material').Value := ADOQueryTemp.fieldbyname('Material').asstring; + frmDyeGreyClothInEdit.CDS_Sub.Post; Next; end; diff --git a/F02染色计划单/DyePlan.dproj.local b/F02染色计划单/DyePlan.dproj.local index 745291f..b5f1e8a 100644 --- a/F02染色计划单/DyePlan.dproj.local +++ b/F02染色计划单/DyePlan.dproj.local @@ -1,62 +1,62 @@  - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas - 1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas 1899/12/30 00:00:00.000.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas 1899/12/30 00:00:00.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas 1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas= - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm + 1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.188,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas 1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeProcessDefin.pas 1899/12/30 00:00:00.000.037,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_Cust_Cloth_PSC.pas 1899/12/30 00:00:00.000.362,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas - 1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm - 1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj - 1899/12/30 00:00:00.000.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas + 1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas 1899/12/30 00:00:00.000.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm + 1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas + 1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas - 1899/12/30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas - 1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm - 1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899/12/30 00:00:00.000.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas - 1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas - 1899/12/30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas - 1899/12/30 00:00:00.000.383,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_CraftSel.pas + 1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas= - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899/12/30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas 1899/12/30 00:00:00.000.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas + 1899/12/30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas + 1899/12/30 00:00:00.000.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas= + 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas + 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899/12/30 00:00:00.000.383,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_CraftSel.pas + 1899/12/30 00:00:00.000.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas + 1899/12/30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas + 1899/12/30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm + 1899/12/30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.213,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas 2025/09/28 12:18:54.000.943,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeSimpleTechnicsList.pas diff --git a/F02染色计划单/DyePlan.identcache b/F02染色计划单/DyePlan.identcache index 8493bfa..aa782ff 100644 Binary files a/F02染色计划单/DyePlan.identcache and b/F02染色计划单/DyePlan.identcache differ diff --git a/F02染色计划单/DyePlan_project.tvsconfig b/F02染色计划单/DyePlan_project.tvsconfig new file mode 100644 index 0000000..d430780 --- /dev/null +++ b/F02染色计划单/DyePlan_project.tvsconfig @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/F02染色计划单/ProjectGroup1_prjgroup.tvsconfig b/F02染色计划单/ProjectGroup1_prjgroup.tvsconfig new file mode 100644 index 0000000..d430780 --- /dev/null +++ b/F02染色计划单/ProjectGroup1_prjgroup.tvsconfig @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/F02染色计划单/U_DyePlanCardInput.dfm b/F02染色计划单/U_DyePlanCardInput.dfm index 3afb0ad..6955fe7 100644 --- a/F02染色计划单/U_DyePlanCardInput.dfm +++ b/F02染色计划单/U_DyePlanCardInput.dfm @@ -1245,6 +1245,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput Align = alClient PopupMenu = PM_1 TabOrder = 0 + ExplicitTop = 45 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/F02染色计划单/U_DyePlanCardInput.pas b/F02染色计划单/U_DyePlanCardInput.pas index 7c8fdbe..ffb0aa0 100644 --- a/F02染色计划单/U_DyePlanCardInput.pas +++ b/F02染色计划单/U_DyePlanCardInput.pas @@ -348,13 +348,13 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select A.OrderNo, A.C_Name, A.F_Name, A.QtyUnit, A.Material,SUM(A.StkQty) as StkQty, SUM(A.StkPiece) as StkPiece '); - sql.Add(' ,IOTime = min(A.IOTime) ,IOType = min(A.ioType) ,C_Width = min(A.C_Width) ,F_Width = min(A.F_Width),C_description = min(B.C_description)'); + sql.Add(' select A.OrderNo, A.C_Name, max(A.F_Name) as F_Name , max(A.QtyUnit) as QtyUnit , max(A.Material) as Material,SUM(A.StkQty) as StkQty, SUM(A.StkPiece) as StkPiece '); + sql.Add(' ,IOTime = min(A.IOTime) ,IOType = max(A.ioType) ,C_Width = max(A.C_Width) ,F_Width = max(A.F_Width),C_description = max(B.C_description)'); sql.Add(' from BS_Cloth_IO A left join Dye_Plan_Main B on A.OrderNo= B.OrderNo '); SQL.Add(' where isnull(A.STKName,'''')=''Ⱦɫ'' and A.IOFlag='''' '); // SQL.Add(' and EXISTS(select * from [dbo].[F_Tool_SplitString](' + quotedstr(FGC_STKID) + ','','' ) X where X.RTValue=A.StkId AND ISNULL(RTValue,'''')<>'''') '); SQL.Add(' and A.OrderNo= ' + QuotedStr(trim(OrderNo.Text))); - SQL.Add(' group by A.OrderNo, A.C_Name, A.F_Name, A.QtyUnit, A.Material '); + SQL.Add(' group by A.OrderNo, A.C_Name'); // ShowMessage(sql.Text); Open; end; @@ -449,15 +449,15 @@ begin if Key = #13 then begin - with ADOQueryTmp do - begin - close; - sql.Clear; - sql.Add('exec P_OrderCR'); +// with ADOQueryTmp do +// begin +// close; +// sql.Clear; +// sql.Add('exec P_OrderCR'); // ShowMessage(sql.Text); - execsql; - end; +// execsql; +// end; fmainID := OrderNo.Text; // fC_Code := Order_Main.fieldbyname('C_Code').asstring; @@ -513,8 +513,7 @@ begin frmDyePlanCardInput := nil; end; -procedure TfrmDyePlanCardInput.FormKeyDown(Sender: TObject; var Key: Word; - Shift: TShiftState); +procedure TfrmDyePlanCardInput.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); begin if Key = VK_ESCAPE then // VK_ESCAPE ESC ij begin @@ -557,7 +556,7 @@ var totalPieces, totalQty: Double; pieceArray: array of Double; qtyArray: array of Double; - mQRCode : string; + mQRCode: string; begin // ֤ if trim(C_Name.Text) = '' then @@ -619,7 +618,6 @@ begin mQRCode := mQRCode + '|0|'; mQRCode := mQRCode + OrderNo.Text + '*0|0'; - try ADOQueryCmd.Connection.BeginTrans; @@ -693,14 +691,15 @@ begin application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); end; - with ADOQueryCmd do - begin - Close; - Sql.Clear; - Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); - Sql.Add('@OrderNo=' + quotedstr(Trim(OrderNo.Text))); - Open; - end; + end; + + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); + Sql.Add('@KaZu=' + quotedstr(Trim(KZmaxID))); + Open; end; with ADOQueryCmd do @@ -872,7 +871,7 @@ procedure TfrmDyePlanCardInput.Button2Click(Sender: TObject); var i, k, fhxInt: integer; maxId, maxno, KZmaxID: string; - mQRCode : string; + mQRCode: string; begin if trim(C_Name.Text) = '' then @@ -966,7 +965,6 @@ begin // ShowMessage(FieldByName('PCQty').Value); FieldByName('batchno').Value := INTTOSTR(k) + '-' + INTTOSTR(i); - FieldByName('QRCode').Value := trim(mQRCode); FieldByName('PrtCount').Value := 0; post; @@ -993,15 +991,15 @@ begin application.MessageBox(PChar(Exception(ExceptObject).Message), 'ʾϢ', 0); end; - with ADOQueryCmd do - begin - Close; - Sql.Clear; - Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); - Sql.Add('@OrderNo=' + quotedstr(Trim(OrderNo.Text))); - Open; - end; + end; + with ADOQueryCmd do + begin + Close; + Sql.Clear; + Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); + Sql.Add('@KaZu=' + quotedstr(Trim(KZmaxID))); + Open; end; with ADOQueryCmd do @@ -1257,7 +1255,7 @@ begin Close; Sql.Clear; Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); - Sql.Add('@OrderNo=' + quotedstr(Trim(OrderNo.Text))); + Sql.Add('@KaZu=' + quotedstr(Trim(CDS_1.fieldbyname('KaZu').AsString))); Open; end; diff --git a/F02染色计划单/U_DyePlanCardList.dfm b/F02染色计划单/U_DyePlanCardList.dfm index 05d907a..2005722 100644 --- a/F02染色计划单/U_DyePlanCardList.dfm +++ b/F02染色计划单/U_DyePlanCardList.dfm @@ -170,6 +170,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList Color = clWhite ParentBackground = False TabOrder = 1 + ExplicitTop = 32 object Label1: TLabel Left = 23 Top = 15 @@ -411,6 +412,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList Align = alClient PopupMenu = PM_1 TabOrder = 2 + ExplicitTop = 125 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -799,6 +801,7 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList #24050#23436#25104 #20840#37096) OnChange = cxTabControl1Change + ExplicitTop = 95 ClientRectBottom = 22 ClientRectRight = 1503 ClientRectTop = 19 diff --git a/F02染色计划单/U_DyePlanCardList.pas b/F02染色计划单/U_DyePlanCardList.pas index 227f067..4480194 100644 --- a/F02染色计划单/U_DyePlanCardList.pas +++ b/F02染色计划单/U_DyePlanCardList.pas @@ -525,7 +525,7 @@ begin Close; Sql.Clear; Sql.Add('exec P_Dye_Plan_UpdateOrderNo '); - Sql.Add('@OrderNo=' + quotedstr(Trim(CDS_1.FieldByName('OrderNo').asString))); + Sql.Add('@KaZu=' + quotedstr(Trim(CDS_1.fieldbyname('KaZu').AsString))); Open; end; Next; diff --git a/F02染色计划单/U_DyePlanInPut.dfm b/F02染色计划单/U_DyePlanInPut.dfm index 4f4ef87..d69afd2 100644 --- a/F02染色计划单/U_DyePlanInPut.dfm +++ b/F02染色计划单/U_DyePlanInPut.dfm @@ -71,7 +71,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut Left = 0 Top = 38 Width = 1376 - Height = 283 + Height = 321 Align = alTop BevelInner = bvNone BevelOuter = bvNone @@ -80,6 +80,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentColor = False ParentCtl3D = False TabOrder = 1 + ExplicitTop = 32 object Label1: TLabel Left = 304 Top = 132 @@ -224,6 +225,19 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentFont = False Visible = False end + object Label9: TLabel + Left = 23 + Top = 263 + Width = 78 + Height = 12 + Caption = #21518#25972#29702#25551#36848#65306 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object F_description: TEdit Tag = 2 Left = 370 @@ -234,9 +248,9 @@ object frmDyePlanInPut: TfrmDyePlanInPut end object C_description: TMemo Tag = 2 - Left = 85 + Left = 107 Top = 180 - Width = 728 + Width = 706 Height = 50 ScrollBars = ssVertical TabOrder = 1 @@ -328,12 +342,21 @@ object frmDyePlanInPut: TfrmDyePlanInPut TabOrder = 10 Visible = False end + object finishDescription: TMemo + Tag = 2 + Left = 107 + Top = 244 + Width = 706 + Height = 50 + ScrollBars = ssVertical + TabOrder = 11 + end end object cxPageControl1: TcxPageControl Left = 0 - Top = 359 + Top = 397 Width = 1376 - Height = 438 + Height = 400 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -344,14 +367,16 @@ object frmDyePlanInPut: TfrmDyePlanInPut TabOrder = 2 Properties.CustomButtons.Buttons = <> Properties.Style = 6 - ClientRectBottom = 438 + ExplicitTop = 359 + ExplicitHeight = 438 + ClientRectBottom = 400 ClientRectRight = 1376 ClientRectTop = 0 end object ToolBar2: TToolBar Tag = 1 Left = 0 - Top = 321 + Top = 359 Width = 1376 Height = 38 AutoSize = True @@ -373,6 +398,7 @@ object frmDyePlanInPut: TfrmDyePlanInPut ParentFont = False ShowCaptions = True TabOrder = 3 + ExplicitTop = 321 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -402,9 +428,9 @@ object frmDyePlanInPut: TfrmDyePlanInPut end object cxGrid1: TcxGrid Left = 0 - Top = 359 + Top = 397 Width = 1376 - Height = 438 + Height = 400 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -413,6 +439,8 @@ object frmDyePlanInPut: TfrmDyePlanInPut Font.Style = [] ParentFont = False TabOrder = 4 + ExplicitTop = 359 + ExplicitHeight = 438 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/F02染色计划单/U_DyePlanInPut.pas b/F02染色计划单/U_DyePlanInPut.pas index b3108fc..b784c1e 100644 --- a/F02染色计划单/U_DyePlanInPut.pas +++ b/F02染色计划单/U_DyePlanInPut.pas @@ -67,6 +67,8 @@ type C_Name: TBtnEditA; C_Code: TEdit; Label5: TLabel; + Label9: TLabel; + finishDescription: TMemo; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); diff --git a/F02染色计划单/U_DyePlanList.dfm b/F02染色计划单/U_DyePlanList.dfm index 50e9224..3a713df 100644 --- a/F02染色计划单/U_DyePlanList.dfm +++ b/F02染色计划单/U_DyePlanList.dfm @@ -325,6 +325,7 @@ inherited frmDyePlanList: TfrmDyePlanList Align = alClient PopupMenu = PM_1 TabOrder = 2 + ExplicitTop = 165 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -398,6 +399,13 @@ inherited frmDyePlanList: TfrmDyePlanList Options.Editing = False Width = 66 end + object Tv1finishDescription: TcxGridDBColumn + Caption = #21518#25972#29702#25551#36848 + DataBinding.FieldName = 'finishDescription' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 91 + end object v1MPRTMF: TcxGridDBColumn Caption = #22383#24067#21517#31216 DataBinding.FieldName = 'F_Name' diff --git a/F02染色计划单/U_DyePlanList.pas b/F02染色计划单/U_DyePlanList.pas index aa5cd42..3cb24ee 100644 --- a/F02染色计划单/U_DyePlanList.pas +++ b/F02染色计划单/U_DyePlanList.pas @@ -97,6 +97,7 @@ type TbJiesuan: TToolButton; TbNoJiesuan: TToolButton; TbTongBu: TToolButton; + Tv1finishDescription: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); diff --git a/F02染色计划单/U_DyeSimpleTechnicsKaiKa.dfm b/F02染色计划单/U_DyeSimpleTechnicsKaiKa.dfm index 08b0d8c..17c521e 100644 --- a/F02染色计划单/U_DyeSimpleTechnicsKaiKa.dfm +++ b/F02染色计划单/U_DyeSimpleTechnicsKaiKa.dfm @@ -131,6 +131,13 @@ inherited frmDyeSimpleTechnicsKaiKa: TfrmDyeSimpleTechnicsKaiKa HeaderAlignmentHorz = taCenter Width = 80 end + object Tv3MCNO: TcxGridDBColumn + Caption = #26426#21488 + DataBinding.FieldName = 'MCNO' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGridLevel8: TcxGridLevel GridView = Tv3 diff --git a/F02染色计划单/U_DyeSimpleTechnicsKaiKa.pas b/F02染色计划单/U_DyeSimpleTechnicsKaiKa.pas index 8d95363..1a85c00 100644 --- a/F02染色计划单/U_DyeSimpleTechnicsKaiKa.pas +++ b/F02染色计划单/U_DyeSimpleTechnicsKaiKa.pas @@ -54,6 +54,7 @@ type TbShow: TToolButton; Tv3Page: TcxGridDBColumn; GPM_3: TcxGridPopupMenu; + Tv3MCNO: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -170,7 +171,7 @@ begin begin Close; SQL.Clear; - sql.Add(' select A.PSID,A.GlideNo,B.PSType,B.PSName,B.page FROM Dye_Plan_Glide A'); + sql.Add(' select A.PSID,A.GlideNo,A.MCNO,B.PSType,B.PSName,B.page FROM Dye_Plan_Glide A'); sql.Add(' inner join Dye_Process B on A.PSID = B.PSID'); sql.Add(' Where A.PCID=''' + trim(fKaZu) + ''''); SQL.Add(' ORDER BY A.GlideNo'); diff --git a/F02染色计划单/U_DyeSimpleTechnicsList.dfm b/F02染色计划单/U_DyeSimpleTechnicsList.dfm index febcc88..35680cf 100644 --- a/F02染色计划单/U_DyeSimpleTechnicsList.dfm +++ b/F02染色计划单/U_DyeSimpleTechnicsList.dfm @@ -198,6 +198,8 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList Height = 744 Align = alLeft TabOrder = 0 + ExplicitLeft = -2 + ExplicitTop = 6 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False diff --git a/F02染色计划单/U_DyeSimpleTechnicsList.pas b/F02染色计划单/U_DyeSimpleTechnicsList.pas index 6bbda49..3e619f5 100644 --- a/F02染色计划单/U_DyeSimpleTechnicsList.pas +++ b/F02染色计划单/U_DyeSimpleTechnicsList.pas @@ -550,6 +550,51 @@ begin Post; end; + + + //////////////ƷϢ޸////////////// + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('select * from BS_Cloth_Info where DTMID =' + quotedstr(Trim(MaxDTMID))); + Open; + end; + ADOQueryCmd.First; + while not ADOQueryCmd.Eof do + begin + ADOQueryCmd.Edit; + ADOQueryCmd.FieldByName('DTMPSlist').Value := Trim(DTMPSlist); + ADOQueryCmd.FieldByName('Editer').Value := Trim(DName); + ADOQueryCmd.FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp); + ADOQueryCmd.Post; + ADOQueryCmd.Next; + end; + + + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('select * from BS_Cloth_Dye_Technics where DTMID =' + quotedstr(Trim(MaxDTMID))); + Open; + end; + ADOQueryCmd.First; + while not ADOQueryCmd.Eof do + begin + ADOQueryCmd.Edit; + ADOQueryCmd.FieldByName('DTMPSlist').Value := Trim(DTMPSlist); + ADOQueryCmd.FieldByName('DTMNo').Value := CDS_2.FieldByName('DTMNo').AsString; + ADOQueryCmd.FieldByName('DTMName').Value := CDS_2.FieldByName('DTMName').AsString; + ADOQueryCmd.Post; + ADOQueryCmd.Next; + end; + //////////////ƷϢ޸////////////// + + + + ADOQueryCmd.Connection.CommitTrans; // FPSID := maxId; Result := True; diff --git a/F02染色计划单/U_DyeTechnicsinputKaika.dfm b/F02染色计划单/U_DyeTechnicsinputKaika.dfm index 87b8370..4fb3986 100644 --- a/F02染色计划单/U_DyeTechnicsinputKaika.dfm +++ b/F02染色计划单/U_DyeTechnicsinputKaika.dfm @@ -104,6 +104,13 @@ inherited frmDyeTechnicsinputKaika: TfrmDyeTechnicsinputKaika HeaderAlignmentHorz = taCenter Width = 183 end + object TV1MCNO: TcxGridDBColumn + Caption = #26426#21488 + DataBinding.FieldName = 'MCNO' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 106 + end end object cxGridLevel2: TcxGridLevel GridView = TV1 @@ -126,7 +133,6 @@ inherited frmDyeTechnicsinputKaika: TfrmDyeTechnicsinputKaika ParentColor = False ShowCaptions = True TabOrder = 1 - ExplicitLeft = -4 object ToolButton2: TToolButton Left = 0 Top = 0 @@ -155,7 +161,7 @@ inherited frmDyeTechnicsinputKaika: TfrmDyeTechnicsinputKaika Color = clSkyBlue TabOrder = 2 ExplicitLeft = -4 - ExplicitTop = 45 + ExplicitTop = 33 object Label2: TLabel Left = 295 Top = 9 diff --git a/F02染色计划单/U_DyeTechnicsinputKaika.pas b/F02染色计划单/U_DyeTechnicsinputKaika.pas index 4c90d47..05fd03f 100644 --- a/F02染色计划单/U_DyeTechnicsinputKaika.pas +++ b/F02染色计划单/U_DyeTechnicsinputKaika.pas @@ -53,6 +53,7 @@ type btnMoveDown: TcxButton; TV1PSID: TcxGridDBColumn; TV1PSType: TcxGridDBColumn; + TV1MCNO: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/F04染色刷卡/DyeProcess.dproj.local b/F04染色刷卡/DyeProcess.dproj.local index 0916fed..5e8d79c 100644 --- a/F04染色刷卡/DyeProcess.dproj.local +++ b/F04染色刷卡/DyeProcess.dproj.local @@ -1,33 +1,33 @@  - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas + 1899/12/30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899/12/30 00:00:00.000.620,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_MachTaskList.pas 1899/12/30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899/12/30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas= - 1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas + 1899/12/30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 2025/09/13 17:08:13.000.517,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_BS_MachineSel.pas 2025/09/25 15:07:18.000.836,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeProcessDefin.pas 2025/11/11 15:05:18.000.149,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas - 2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.dfm - 2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.pas + 2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.dfm + 2025/11/11 15:06:44.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas diff --git a/F04染色刷卡/U_DyePCDetailsList.dfm b/F04染色刷卡/U_DyePCDetailsList.dfm index 2634e36..0316d7e 100644 --- a/F04染色刷卡/U_DyePCDetailsList.dfm +++ b/F04染色刷卡/U_DyePCDetailsList.dfm @@ -1,7 +1,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList Caption = #25490#20135#20449#24687#26126#32454 ClientHeight = 584 - ClientWidth = 1180 + ClientWidth = 1216 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Height = -11 @@ -9,8 +9,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList OldCreateOrder = True WindowState = wsMaximized OnKeyDown = FormKeyDown - ExplicitLeft = -14 - ExplicitWidth = 1196 + ExplicitWidth = 1232 ExplicitHeight = 623 PixelsPerInch = 96 TextHeight = 13 @@ -18,7 +17,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList Tag = 1 Left = 0 Top = 0 - Width = 1180 + Width = 1216 Height = 38 AutoSize = True ButtonHeight = 38 @@ -61,22 +60,22 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList ImageIndex = 21 Visible = False end - object ToolButton2: TToolButton - Left = 213 - Top = 0 - AutoSize = True - Caption = #25195#25551#25490#32568 - ImageIndex = 2 - OnClick = ToolButton2Click - end object TBExport: TToolButton - Left = 308 + Left = 213 Top = 0 AutoSize = True Caption = #23548#20986'Excel' ImageIndex = 20 OnClick = TBExportClick end + object TbEdit: TToolButton + Left = 314 + Top = 0 + AutoSize = True + Caption = #26102#38388#20462#25913 + ImageIndex = 3 + OnClick = TbEditClick + end object TbUpdateTime: TToolButton Left = 409 Top = 0 @@ -105,15 +104,14 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList object Panel1: TPanel [1] Left = 0 Top = 38 - Width = 1180 - Height = 64 + Width = 1216 + Height = 83 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered - Caption = 'CCQX1' Color = clSkyBlue TabOrder = 1 - ExplicitLeft = 1 + ExplicitLeft = -1 object Label3: TLabel Left = 260 Top = 10 @@ -157,20 +155,211 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList Caption = #32467#26463#26102#38388 end object Label4: TLabel - Left = 260 + Left = 262 Top = 36 Width = 24 Height = 13 Caption = #35774#22791 end + object Label5: TLabel + Left = 1016 + Top = 6 + Width = 24 + Height = 13 + Caption = #25490#24207 + Font.Charset = DEFAULT_CHARSET + Font.Color = clMenuHighlight + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Label6: TLabel + Left = 856 + Top = 6 + Width = 24 + Height = 13 + Caption = #31579#36873 + Font.Charset = DEFAULT_CHARSET + Font.Color = clMenuHighlight + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Label8: TLabel + Left = 444 + Top = 10 + Width = 48 + Height = 13 + Caption = #25104#21697#21517#31216 + end + object Label9: TLabel + Left = 444 + Top = 37 + Width = 36 + Height = 13 + Caption = #35746#21333#21495 + end + object SBCCQX1: TSpeedButton + Tag = 1 + Left = 9 + Top = 57 + Width = 50 + Height = 20 + GroupIndex = 1 + Down = True + Caption = #28165#27927'1' + OnClick = SBCCQX1Click + end + object SBDX3: TSpeedButton + Tag = 5 + Left = 233 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #23450#22411'3' + OnClick = SBCCQX1Click + end + object SBDX2: TSpeedButton + Tag = 4 + Left = 177 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #23450#22411'2' + OnClick = SBCCQX1Click + end + object SBDX1: TSpeedButton + Tag = 3 + Left = 121 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #23450#22411'1' + OnClick = SBCCQX1Click + end + object SBJG1: TSpeedButton + Tag = 8 + Left = 458 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #26426#32568'1' + OnClick = SBCCQX1Click + end + object SBDX6: TSpeedButton + Tag = 8 + Left = 402 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #23450#22411'6' + OnClick = SBCCQX1Click + end + object SBDX5: TSpeedButton + Tag = 7 + Left = 346 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #23450#22411'5' + OnClick = SBCCQX1Click + end + object SBDX4: TSpeedButton + Tag = 6 + Left = 290 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #23450#22411'4' + OnClick = SBCCQX1Click + end + object SBJRG1: TSpeedButton + Tag = 10 + Left = 515 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #21367#26579#32568'1' + OnClick = SBCCQX1Click + end + object SBJRG3: TSpeedButton + Tag = 12 + Left = 627 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #21367#26579#32568'3' + OnClick = SBCCQX1Click + end + object SBZM1: TSpeedButton + Tag = 13 + Left = 684 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #36711#27611'1' + OnClick = SBCCQX1Click + end + object SBJRG2: TSpeedButton + Tag = 11 + Left = 571 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #21367#26579#32568'2' + OnClick = SBCCQX1Click + end + object SBZM2: TSpeedButton + Tag = 13 + Left = 740 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #36711#27611'2' + OnClick = SBCCQX1Click + end + object SBCCQX2: TSpeedButton + Tag = 2 + Left = 65 + Top = 57 + Width = 50 + Height = 20 + GroupIndex = 1 + Caption = #28165#27927'2' + OnClick = SBCCQX1Click + end + object SBPD1: TSpeedButton + Tag = 15 + Left = 796 + Top = 57 + Width = 50 + Height = 22 + GroupIndex = 1 + Caption = #25293#25171'1' + OnClick = SBCCQX1Click + end object pcid: TEdit Tag = 2 Left = 314 Top = 6 - Width = 154 + Width = 120 Height = 21 TabOrder = 0 - OnChange = pcidChange + OnKeyPress = pcidKeyPress end object customerNoName: TEdit Tag = 2 @@ -179,7 +368,6 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList Width = 100 Height = 21 TabOrder = 1 - OnChange = pcidChange end object ywy: TEdit Tag = 2 @@ -188,7 +376,6 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList Width = 100 Height = 21 TabOrder = 2 - OnChange = pcidChange end object lbHx: TEdit Tag = 2 @@ -197,7 +384,6 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList Width = 80 Height = 21 TabOrder = 3 - OnChange = pcidChange end object BegDate: TDateTimePicker Left = 88 @@ -238,7 +424,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList TabOrder = 7 end object MCNO: TcxButtonEdit - Left = 312 + Left = 314 Top = 33 Properties.Buttons = < item @@ -247,16 +433,77 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList end> Properties.OnButtonClick = MCNOPropertiesButtonClick TabOrder = 8 - Text = #38271#36710#28165#27927#26426 - Width = 156 + Text = #38271#36710#28165#27927#26426'1' + Width = 120 end object MCName: TEdit - Left = 464 - Top = 33 + Left = 672 + Top = 6 Width = 121 Height = 21 TabOrder = 9 Text = 'CCQX1' + Visible = False + end + object cbALL_temperature6: TCheckBox + Left = 1056 + Top = 6 + Width = 65 + Height = 17 + Caption = #28201#24230 + TabOrder = 10 + OnClick = cbALL_temperature6Click + end + object cbAll_zhuji: TCheckBox + Left = 1056 + Top = 29 + Width = 65 + Height = 17 + Caption = #21161#21058 + TabOrder = 11 + OnClick = cbALL_temperature6Click + end + object cxComboBox1: TcxComboBox + Left = 886 + Top = 25 + Properties.Items.Strings = ( + #20840#37096 + #26410#25490#20135 + #25490#20135#26410#25253#24037 + #24050#25253#24037 + #25253#24037#26410#23436#25104 + #24050#23436#25104) + Properties.OnChange = cxComboBox1PropertiesChange + TabOrder = 12 + Text = #20840#37096 + Width = 121 + end + object cbTime: TCheckBox + Left = 1056 + Top = 52 + Width = 65 + Height = 17 + Caption = #24635#29992#26102 + TabOrder = 13 + OnClick = cbALL_temperature6Click + end + object C_Name: TEdit + Tag = 2 + Left = 498 + Top = 6 + Width = 120 + Height = 21 + TabOrder = 14 + OnKeyPress = pcidKeyPress + end + object OrderNo: TEdit + Tag = 2 + Left = 498 + Top = 33 + Width = 120 + Height = 21 + TabOrder = 15 + OnKeyPress = pcidKeyPress end end object MovePanel2: TMovePanel [2] @@ -278,31 +525,33 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList end object Panel2: TPanel [3] Left = 0 - Top = 102 - Width = 1180 - Height = 482 + Top = 121 + Width = 1216 + Height = 463 Align = alClient TabOrder = 3 - ExplicitTop = 98 object cxGrid1: TcxGrid Left = 1 Top = 1 - Width = 592 - Height = 480 + Width = 736 + Height = 461 Align = alLeft TabOrder = 0 - ExplicitTop = 6 + ExplicitTop = 2 object Tv1: TcxGridDBTableView OnKeyDown = Tv1KeyDown Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> + OnCustomDrawCell = Tv1CustomDrawCell DataController.DataSource = DS_1 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> + OptionsData.Editing = False OptionsView.GroupByBox = False + Styles.Selection = DataLink_DyeProcess.SHuangSe object Tv1PCID: TcxGridDBColumn - Caption = #27969#31243#21345#21495 + Caption = #21345#32452#21495 DataBinding.FieldName = 'PCID' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -336,6 +585,20 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList HeaderAlignmentHorz = taCenter Width = 90 end + object Tv1All_zhuji: TcxGridDBColumn + Caption = #21161#21058#31181#31867 + DataBinding.FieldName = 'All_zhuji' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 100 + end + object Tv1All_rate: TcxGridDBColumn + Caption = #21161#21058#27604#20363 + DataBinding.FieldName = 'All_rate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1PCQty: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'PCQty' @@ -372,6 +635,22 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList object Tv1GlideID: TcxGridDBColumn DataBinding.FieldName = 'GlideID' DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1IsConflict: TcxGridDBColumn + Caption = #26159#21542#20914#31361 + DataBinding.FieldName = 'IsConflict' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1CGlideNo: TcxGridDBColumn + DataBinding.FieldName = 'GlideNo' + DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Width = 80 end @@ -381,25 +660,27 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList end end object cxGrid2: TcxGrid - Left = 680 + Left = 824 Top = 1 - Width = 499 - Height = 480 - Align = alRight + Width = 391 + Height = 461 + Align = alClient TabOrder = 1 - ExplicitTop = 6 object Tv2: TcxGridDBTableView OnKeyDown = Tv2KeyDown Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> + OnCellClick = Tv2CellClick OnCustomDrawCell = Tv2CustomDrawCell DataController.DataSource = DS_2 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> + OptionsData.Editing = False OptionsView.GroupByBox = False + Styles.Selection = DataLink_DyeProcess.SHuangSe object cxGridDBColumn1: TcxGridDBColumn - Caption = #27969#31243#21345#21495 + Caption = #21345#32452#21495 DataBinding.FieldName = 'PCID' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -433,6 +714,20 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList HeaderAlignmentHorz = taCenter Width = 90 end + object Tv2CAll_zhuji: TcxGridDBColumn + Caption = #21161#21058#31181#31867 + DataBinding.FieldName = 'All_zhuji' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 100 + end + object Tv2All_rate: TcxGridDBColumn + Caption = #21161#21058#27604#20363 + DataBinding.FieldName = 'All_rate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object cxGridDBColumn6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'PCQty' @@ -451,6 +746,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList Caption = #25490#20135 DataBinding.FieldName = 'PC_FLAG' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Width = 90 end @@ -458,12 +754,21 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList Caption = #25253#24037 DataBinding.FieldName = 'isComplete' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Width = 90 end object Tv2GlideID: TcxGridDBColumn DataBinding.FieldName = 'GlideID' DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv2GlideNo: TcxGridDBColumn + DataBinding.FieldName = 'GlideNo' + DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Width = 80 end @@ -472,41 +777,49 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList GridView = Tv2 end end - object cxButton1: TcxButton - Left = 599 - Top = 6 - Width = 75 - Height = 25 - Caption = '<--'#25490#20135'--' + object Panel3: TPanel + Left = 737 + Top = 1 + Width = 87 + Height = 461 + Align = alLeft TabOrder = 2 - OnClick = cxButton1Click - end - object cxButton2: TcxButton - Left = 599 - Top = 37 - Width = 75 - Height = 25 - Caption = '--'#21462#28040'-->' - TabOrder = 3 - OnClick = cxButton2Click - end - object TbMoveUp: TcxButton - Left = 599 - Top = 80 - Width = 75 - Height = 25 - Caption = #19978#31227 - TabOrder = 4 - OnClick = TbMoveUpClick - end - object TbMoveDown: TcxButton - Left = 599 - Top = 111 - Width = 75 - Height = 25 - Caption = #19979#31227 - TabOrder = 5 - OnClick = TbMoveDownClick + object cxButton1: TcxButton + Left = 6 + Top = 5 + Width = 75 + Height = 25 + Caption = '<--'#25490#20135'--' + TabOrder = 0 + OnClick = cxButton1Click + end + object cxButton2: TcxButton + Left = 6 + Top = 36 + Width = 75 + Height = 25 + Caption = '--'#21462#28040'-->' + TabOrder = 1 + OnClick = cxButton2Click + end + object TbMoveUp: TcxButton + Left = 6 + Top = 78 + Width = 75 + Height = 25 + Caption = #19978#31227 + TabOrder = 2 + OnClick = TbMoveUpClick + end + object TbMoveDown: TcxButton + Left = 6 + Top = 109 + Width = 75 + Height = 25 + Caption = #19979#31227 + TabOrder = 3 + OnClick = TbMoveDownClick + end end end inherited ADOQueryBaseCmd: TADOQuery diff --git a/F04染色刷卡/U_DyePCDetailsList.pas b/F04染色刷卡/U_DyePCDetailsList.pas index 7350f2d..8b69df3 100644 --- a/F04染色刷卡/U_DyePCDetailsList.pas +++ b/F04染色刷卡/U_DyePCDetailsList.pas @@ -13,7 +13,7 @@ uses RM_Class, RM_GridReport, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxScrollbarAnnotations, cxContainer, cxTextEdit, cxMaskEdit, - Vcl.Menus, cxButtons; + Vcl.Menus, cxButtons, Vcl.Buttons; type TfrmDyePCDetailsList = class(TfrmBaseList) @@ -41,7 +41,6 @@ type lbHx: TEdit; Label7: TLabel; ToolButton1: TToolButton; - ToolButton2: TToolButton; BegDate: TDateTimePicker; EndDate: TDateTimePicker; Label1: TLabel; @@ -82,12 +81,46 @@ type MCNO: TcxButtonEdit; MCName: TEdit; Label4: TLabel; + Tv1GlideID: TcxGridDBColumn; + Tv2GlideID: TcxGridDBColumn; + Tv1IsConflict: TcxGridDBColumn; + Tv1CGlideNo: TcxGridDBColumn; + Tv2GlideNo: TcxGridDBColumn; + Panel3: TPanel; cxButton1: TcxButton; cxButton2: TcxButton; TbMoveUp: TcxButton; TbMoveDown: TcxButton; - Tv1GlideID: TcxGridDBColumn; - Tv2GlideID: TcxGridDBColumn; + cbALL_temperature6: TCheckBox; + cbAll_zhuji: TCheckBox; + cxComboBox1: TcxComboBox; + Label5: TLabel; + Label6: TLabel; + cbTime: TCheckBox; + Tv1All_zhuji: TcxGridDBColumn; + Tv1All_rate: TcxGridDBColumn; + Tv2CAll_zhuji: TcxGridDBColumn; + Tv2All_rate: TcxGridDBColumn; + TbEdit: TToolButton; + Label8: TLabel; + C_Name: TEdit; + Label9: TLabel; + OrderNo: TEdit; + SBCCQX1: TSpeedButton; + SBDX3: TSpeedButton; + SBDX2: TSpeedButton; + SBDX1: TSpeedButton; + SBJG1: TSpeedButton; + SBDX6: TSpeedButton; + SBDX5: TSpeedButton; + SBDX4: TSpeedButton; + SBJRG1: TSpeedButton; + SBJRG3: TSpeedButton; + SBZM1: TSpeedButton; + SBJRG2: TSpeedButton; + SBZM2: TSpeedButton; + SBCCQX2: TSpeedButton; + SBPD1: TSpeedButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -97,12 +130,10 @@ type procedure FormShow(Sender: TObject); procedure TBExportClick(Sender: TObject); procedure TBFindClick(Sender: TObject); - procedure pcidChange(Sender: TObject); procedure PRTColorChange(Sender: TObject); procedure TBdelClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); - procedure ToolButton2Click(Sender: TObject); - procedure tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); procedure TbUpdateTimeClick(Sender: TObject); procedure MCNOPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); @@ -115,6 +146,12 @@ type procedure Tv1BegTimePropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); procedure TbMoveUpClick(Sender: TObject); procedure TbMoveDownClick(Sender: TObject); + procedure Tv2CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure cxComboBox1PropertiesChange(Sender: TObject); + procedure cbALL_temperature6Click(Sender: TObject); + procedure TbEditClick(Sender: TObject); + procedure pcidKeyPress(Sender: TObject; var Key: Char); + procedure SBCCQX1Click(Sender: TObject); private FLeft, FTop: Integer; @@ -123,15 +160,20 @@ type function SaveData(): boolean; function GetLastLine(const AText: string): string; function SaveMove(const Flag: string): Boolean; + function GetNextTenMinutes(ACurrentTime: TDateTime): TDateTime; + + function BuildOrderBySQL: string; { Private declarations } public fsyrName, canshu1: string; + fsql2: string; { Public declarations } end; var frmDyePCDetailsList: TfrmDyePCDetailsList; + OrderList: array of string; implementation @@ -155,6 +197,36 @@ begin Key := 0; // ֹ Close; end; + + VK_LEFT: + begin + // ƶ߼ + ShowMessage(''); + cxButton1.Click; + Key := 0; // ֹ + end; + + VK_RIGHT: + begin + // ƶ߼ + cxButton2.Click; + Key := 0; + end; + + VK_UP: + begin + // ƶ߼ + TbMoveUp.Click; + Key := 0; + end; + + VK_DOWN: + begin + // ƶ߼ + TbMoveDown.Click; + Key := 0; + end; + end; end; @@ -248,7 +320,7 @@ begin mNewValue := mNewValue + '' + #13; end; //////////////////////ʾ - mNewValue := mNewValue + ':' + CDS_1.FieldByName('All_zhuji').AsString + #13; + mNewValue := mNewValue + ':' + CDS_1.FieldByName('All_zhuji').AsString + ' ' + CDS_1.FieldByName('All_rate').AsString + #13; mNewValue := mNewValue + CDS_1.FieldByName('PCID').AsString + #13; mNewValue := mNewValue + CDS_1.FieldByName('GlideID').AsString; @@ -425,7 +497,7 @@ begin end; // ʾ - mNewValue := mNewValue + ':' + CDS_1.FieldByName('All_zhuji').AsString + #13; + mNewValue := mNewValue + ':' + CDS_1.FieldByName('All_zhuji').AsString + ' ' + CDS_1.FieldByName('All_rate').AsString + #13; mNewValue := mNewValue + CDS_1.FieldByName('PCID').AsString + #13; mNewValue := mNewValue + CDS_1.FieldByName('GlideID').AsString; @@ -514,6 +586,106 @@ begin end; end; +procedure TfrmDyePCDetailsList.SBCCQX1Click(Sender: TObject); +begin + if Sender is TSpeedButton then + begin + case (Sender as TSpeedButton).Tag of // Tagֲͬť + 1: + begin + MCNO.Text := 'ϴ1'; + MCName.Text := 'CCQX1'; + InitGrid1(); + end; + 2: + begin + MCNO.Text := 'ϴ2'; + MCName.Text := 'CCQX2'; + InitGrid1(); + end; + 3: + begin + MCNO.Text := 'ͻ1'; + MCName.Text := 'DX1'; + InitGrid1(); + end; + 4: + begin + MCNO.Text := 'ͻ2'; + MCName.Text := 'DX2'; + InitGrid1(); + end; + 5: + begin + MCNO.Text := 'ͻ3'; + MCName.Text := 'DX3'; + InitGrid1(); + end; + 6: + begin + MCNO.Text := 'ͻ4'; + MCName.Text := 'DX4'; + InitGrid1(); + end; + 7: + begin + MCNO.Text := 'ͻ5'; + MCName.Text := 'DX5'; + InitGrid1(); + end; + 8: + begin + MCNO.Text := 'ͻ6'; + MCName.Text := 'DX6'; + InitGrid1(); + end; + 9: + begin + MCNO.Text := '1'; + MCName.Text := 'JG1'; + InitGrid1(); + end; + 10: + begin + MCNO.Text := 'Ⱦ1'; + MCName.Text := 'JRG1'; + InitGrid1(); + end; + 11: + begin + MCNO.Text := 'Ⱦ2'; + MCName.Text := 'JRG2'; + InitGrid1(); + end; + 12: + begin + MCNO.Text := 'Ⱦ3'; + MCName.Text := 'JRG3'; + InitGrid1(); + end; + 13: + begin + MCNO.Text := 'ë1'; + MCName.Text := 'ZM1'; + InitGrid1(); + end; + 14: + begin + MCNO.Text := 'ë˫1'; + MCName.Text := 'ZM2'; + InitGrid1(); + end; + 15: + begin + MCNO.Text := 'Ĵ1'; + MCName.Text := 'PD1'; + InitGrid1(); + end; + end; + end; + +end; + function TfrmDyePCDetailsList.GetLastLine(const AText: string): string; var StringList: TStringList; @@ -529,20 +701,39 @@ begin end; end; -procedure TfrmDyePCDetailsList.cxButton1Click(Sender: TObject); +function TfrmDyePCDetailsList.GetNextTenMinutes(ACurrentTime: TDateTime): TDateTime; begin + // 㵽һʮ + Result := Trunc(ACurrentTime * 24 * 6) / (24 * 6); // ȡ10 + if Result <= ACurrentTime then + Result := Result + (10 / (24 * 60)); // ȡСڵڵǰʱ䣬10 +end; +procedure TfrmDyePCDetailsList.cxButton1Click(Sender: TObject); +var + MaxEndTime: TDateTime; + mGlideID1, mGlideID2: string; + mConflict1, mConflict2: Integer; +begin + mConflict1 := 0; + mConflict2 := 0; if CDS_2.FieldByName('PC_FLAG').AsString = '1' then begin Application.MessageBox('Ų', 'ʾϢ', MB_OK); exit; end - else if CDS_2.FieldByName('isComplete').AsString <> '' then + else if not CDS_2.FieldByName('isComplete').IsNull then begin Application.MessageBox('ѱ', 'ʾϢ', MB_OK); exit; end; + if (CDS_2.FieldByName('time').AsString = '0') or (CDS_2.FieldByName('time').IsNull) then + begin + Application.MessageBox('ʱ', 'ʾϢ', MB_OK); + Exit; + end; + try ADOQueryCmd.Connection.BeginTrans; @@ -558,6 +749,12 @@ begin Open; end; + if (ADOQueryMain.RecordCount > 0) and (not ADOQueryMain.FieldByName('MaxTime').IsNull) then + MaxEndTime := ADOQueryMain.FieldByName('MaxTime').AsDateTime + else + MaxEndTime := GetNextTenMinutes(Now); // ʹһʮ + + with CDS_1 do begin @@ -574,17 +771,69 @@ begin FieldByName('C_Width').value := CDS_2.FieldByName('C_Width').AsString; FieldByName('All_Speed').value := CDS_2.FieldByName('All_Speed').AsString; + FieldByName('GlideNo').value := CDS_2.FieldByName('GlideNo').AsString; FieldByName('All_zhuji').value := CDS_2.FieldByName('All_zhuji').AsString; + FieldByName('All_rate').value := CDS_2.FieldByName('All_rate').AsString; FieldByName('gj_number').AsString := CDS_2.FieldByName('gj_number').AsString; FieldByName('fp_gjNumber').AsString := CDS_2.FieldByName('fp_gjNumber').AsString; FieldByName('PCQty').AsString := CDS_2.FieldByName('PCQty').AsString; - FieldByName('begTime').value := ADOQueryMain.FieldByName('MaxTime').AsString; + FieldByName('begTime').value := MaxEndTime; Post; end; + //////////////Ų˳ʱ//////// + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_2.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and endTime > ' + quotedStr(FormatDateTime('yyyy-mm-dd hh:nn:ss', MaxEndTime))); + SQL.Add(' and GlideNo < ' + QuotedStr(Trim(CDS_2.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + if Application.MessageBox('ʱγͻǷ', 'ʾϢ', MB_OKCANCEL + MB_ICONQUESTION) = IDOK then + begin + mConflict1 := 1; + end + else + begin + ADOQueryCmd.Connection.RollbackTrans; + InitGrid1(); + Exit; + end; + end; + end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_2.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and BegTime < DATEADD(MINUTE, ' + CDS_2.FieldByName('time').AsString + ', ' + QuotedStr(FormatDateTime('yyyy-mm-dd hh:nn:ss', MaxEndTime)) + ')'); + SQL.Add(' and GlideNo > ' + QuotedStr(Trim(CDS_2.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + if Application.MessageBox('ʱγͻǷ', 'ʾϢ', MB_OKCANCEL + MB_ICONQUESTION) = IDOK then + begin + mConflict2 := 1; + end + else + begin + // û"ȡ"˳ + ADOQueryCmd.Connection.RollbackTrans; + InitGrid1(); + Exit; + end; + end; + end; +///////////////////////////////////////////// ADOQueryCmd.Connection.CommitTrans; except if ADOQueryCmd.Connection.InTransaction then @@ -594,12 +843,59 @@ begin end; if SaveData() then begin + if mConflict1 = 1 then + begin + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('UPDATE Dye_Plan_Glide SET IsConflict = 1'); + SQL.Add('WHERE PCID = ' + QuotedStr(Trim(CDS_2.FieldByName('PCID').AsString))); + SQL.Add('AND PC_FLAG = 1 AND endTime > ' + QuotedStr(FormatDateTime('yyyy-mm-dd hh:nn:ss', MaxEndTime))); + SQL.Add('AND GlideNo <= ' + QuotedStr(Trim(CDS_2.FieldByName('GlideNo').AsString))); + ExecSQL; + end; + end; + if mConflict2 = 1 then + begin + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('UPDATE Dye_Plan_Glide SET IsConflict = 1'); + SQL.Add('WHERE PCID = ' + QuotedStr(Trim(CDS_2.FieldByName('PCID').AsString))); + SQL.Add('AND PC_FLAG = 1 AND BegTime < DATEADD(MINUTE, ' + CDS_2.FieldByName('time').AsString + ', ' + QuotedStr(FormatDateTime('yyyy-mm-dd hh:nn:ss', MaxEndTime)) + ')'); + SQL.Add('AND GlideNo >= ' + QuotedStr(Trim(CDS_2.FieldByName('GlideNo').AsString))); + ExecSQL; + end; + end; + Application.MessageBox('Ųɹ', 'ʾϢ', MB_OK); end; + + if not CDS_1.IsEmpty then + mGlideID1 := Trim(CDS_1.FieldByName('GlideID').AsString) + else + mGlideID1 := ''; + if not CDS_2.IsEmpty then + mGlideID2 := Trim(CDS_2.FieldByName('GlideID').AsString) + else + mGlideID2 := ''; initGrid1(); + initGrid2(); + // Զλԭ¼ + if mGlideID1 <> '' then + CDS_1.Locate('GlideID', mGlideID1, []); + // Զλԭ¼ + if mGlideID2 <> '' then + CDS_2.Locate('GlideID', mGlideID2, []); + end; procedure TfrmDyePCDetailsList.cxButton2Click(Sender: TObject); +var + mGlideID1, mGlideID2: string; + mConflict: Integer; begin if MessageDlg('ȷȡ˲޷', mtWarning, [mbOK, mbCancel], 0) = mrOK then begin @@ -607,6 +903,8 @@ begin ADOQueryCmd.Connection.BeginTrans; try + + mConflict := 0; // һ² with ADOQueryCmd do begin @@ -616,7 +914,7 @@ begin SQL.Add(MCName.Text + ' = null WHERE '); SQL.Add(' time >= ' + QuotedStr(CDS_1.FieldByName('BegTime').AsString)); SQL.Add(' and time < ' + QuotedStr(CDS_1.FieldByName('EndTime').AsString)); - showMessage(sql.Text); +// showMessage(sql.Text); ExecSQL; end; @@ -625,15 +923,86 @@ begin begin Close; SQL.Clear; - SQL.Add(' update Dye_Plan_Glide set PC_FLAG = 0,endTime = null,begTime = null where GlideID = ' + QuotedStr(Trim(CDS_1.FieldByName('GlideID').asString))); + SQL.Add(' update Dye_Plan_Glide set PC_FLAG = 0,IsConflict = 0,endTime = null,begTime = null where GlideID = ' + QuotedStr(Trim(CDS_1.FieldByName('GlideID').asString))); ExecSQL; end; +/////////////////////////////ʱͻ///////////////////// + with ADOQueryBaseCmd do + begin + Close; + sql.Clear; + sql.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + sql.Add(' and PC_FLAG = 1'); + Open; + end; + ADOQueryBaseCmd.First; + while not ADOQueryBaseCmd.Eof do + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and endTime > ' + quotedStr(ADOQueryBaseCmd.FieldByName('BegTime').AsString)); + SQL.Add(' and GlideNo < ' + QuotedStr(Trim(ADOQueryBaseCmd.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + + mConflict := 1; + + end; + end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and BegTime < ' + quotedStr(ADOQueryBaseCmd.FieldByName('EndTime').AsString)); + SQL.Add(' and GlideNo > ' + QuotedStr(Trim(ADOQueryBaseCmd.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + mConflict := 1; + end; + end; + + if mConflict = 0 then + begin + ADOQueryBaseCmd.Edit; + ADOQueryBaseCmd.FieldByName('IsConflict').Value := 0; + ADOQueryBaseCmd.Post; + end; + +///////////////////////////////////////////// + ADOQueryBaseCmd.Next; + end; + + //////////////Ų˳ʱ//////// // ɹύ ADOQueryCmd.Connection.CommitTrans; Application.MessageBox('ȡɹ', 'ʾ', 0); - InitGrid1(); + if not CDS_1.IsEmpty then + mGlideID1 := Trim(CDS_1.FieldByName('GlideID').AsString) + else + mGlideID1 := ''; + if not CDS_2.IsEmpty then + mGlideID2 := Trim(CDS_2.FieldByName('GlideID').AsString) + else + mGlideID2 := ''; + initGrid1(); + initGrid2(); + // Զλԭ¼ + if mGlideID1 <> '' then + CDS_1.Locate('GlideID', mGlideID1, []); + // Զλԭ¼ + if mGlideID2 <> '' then + CDS_2.Locate('GlideID', mGlideID2, []); except on E: Exception do @@ -646,6 +1015,11 @@ begin end; end; +procedure TfrmDyePCDetailsList.cxComboBox1PropertiesChange(Sender: TObject); +begin + InitGrid2(); +end; + procedure TfrmDyePCDetailsList.FormClose(Sender: TObject; var Action: TCloseAction); begin inherited; @@ -682,12 +1056,14 @@ begin close; filtered := false; sql.Clear; - SQL.Add('select * from V_Dye_Cloth_PaiGang where (BegTime between :StartTime and :EndTime) and PC_FLAG = 1 and MCNO = :MCNO order By BegTime '); + SQL.Add('select * from V_Dye_Cloth_PaiGang where (BegTime between :StartTime and :EndTime) and PC_FLAG = 1 and MCName = :MCName order By BegTime '); Parameters.ParamByName('StartTime').Value := Trunc(BegDate.Date) + Frac(BegTime.Time); Parameters.ParamByName('EndTime').Value := Trunc(EndDate.Date) + Frac(EndTime.Time); - Parameters.ParamByName('MCNO').Value := MCNO.Text; + Parameters.ParamByName('MCName').Value := MCName.Text; +// ShowMessage(sql.Text); Open; end; + SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); SCreateCDS(ADOQueryMain, CDS_1); SInitCDSData(ADOQueryMain, CDS_1); finally @@ -703,6 +1079,7 @@ var mAction: string; rs: _Recordset; r: integer; + msql1: string; begin // ʱ @@ -710,12 +1087,27 @@ begin tv1.BeginUpdate; ADOQueryMain.DisableControls; + if cxComboBox1.Text = 'δŲ' then + msql1 := 'and PC_FLAG = 0' + else if cxComboBox1.Text = 'Ųδ' then + msql1 := 'and isComplete is null and PC_FLAG = 1' + else if cxComboBox1.Text = 'ѱ' then + msql1 := 'and isComplete is not null' + else if cxComboBox1.Text = 'δ' then + msql1 := 'and isComplete = 0' + else if cxComboBox1.Text = '' then + msql1 := 'and isComplete = 1' + else + msql1 := ''; + + fsql2 := BuildOrderBySQL; with ADOQueryMain do begin close; filtered := false; sql.Clear; - SQL.Add('select * from V_Dye_Cloth_PaiGang'); + SQL.Add(' select * from V_Dye_Cloth_PaiGang where 1=1 ' + msql1 + fsql2); +// ShowMessage(sql.Text); Open; end; @@ -728,6 +1120,92 @@ begin end; end; + + +// ѡ +procedure TfrmDyePCDetailsList.cbALL_temperature6Click(Sender: TObject); +var + CheckBox: TCheckBox; + FieldName, OrderText: string; + I, Index: Integer; +begin + CheckBox := Sender as TCheckBox; + + if CheckBox = cbALL_temperature6 then + FieldName := 'ALL_temperature6' + else if CheckBox = cbAll_zhuji then + FieldName := 'All_zhuji' + else if CheckBox = cbTime then + FieldName := 'Time' + else + Exit; + + OrderText := FieldName + ' ASC'; + + // ǷѴ + Index := -1; + for I := 0 to High(OrderList) do + begin + if OrderList[I] = OrderText then + begin + Index := I; + Break; + end; + end; + + if CheckBox.Checked then + begin + // ӻƶĩβ + if Index >= 0 then + begin + // Ѵڣɾ + for I := Index to High(OrderList) - 1 do + OrderList[I] := OrderList[I + 1]; + SetLength(OrderList, Length(OrderList) - 1); + end; + // ӵĩβ + SetLength(OrderList, Length(OrderList) + 1); + OrderList[High(OrderList)] := OrderText; + end + else + begin + // ȡѡУƳ + if Index >= 0 then + begin + for I := Index to High(OrderList) - 1 do + OrderList[I] := OrderList[I + 1]; + SetLength(OrderList, Length(OrderList) - 1); + end; + end; + + InitGrid2(); +end; + +// SQLʹö̬汾 +function TfrmDyePCDetailsList.BuildOrderBySQL: string; +var + I: Integer; + OrderStr: string; +begin + // ûѡκʹĬ + if Length(OrderList) = 0 then + begin + Result := ' order By PCID ASC , GlideNo ASC'; + Exit; + end; + + // ƴSQL + OrderStr := ''; + for I := 0 to High(OrderList) do + begin + if I > 0 then + OrderStr := OrderStr + ' , '; + OrderStr := OrderStr + OrderList[I]; + end; + + Result := ' Order By ' + OrderStr; +end; + procedure TfrmDyePCDetailsList.MCNOPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try @@ -789,23 +1267,8 @@ end; procedure TfrmDyePCDetailsList.ToolButton1Click(Sender: TObject); begin - WriteCxGrid(self.Caption + tv1.Name, Tv1, 'ŲϢ'); -end; - -procedure TfrmDyePCDetailsList.ToolButton2Click(Sender: TObject); -begin -// if ADOQuerymain.IsEmpty then -// exit; - - frmMachTaskList := TfrmMachTaskList.create(self); - with frmMachTaskList do - begin -// fcurMachId := trim(self.adoquerymain.FieldByName('mcid').AsString); -// machName.text := trim(self.adoquerymain.FieldByName('mcName').AsString); - showModal; - free; - end; - initgrid1(); + WriteCxGrid(self.Caption + tv1.Name, Tv1, 'ŲϢϸ'); + WriteCxGrid(self.Caption + tv1.Name, Tv1, 'ŲϢϸ'); end; procedure TfrmDyePCDetailsList.Tv1BegTimePropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); @@ -845,27 +1308,36 @@ begin end; end; -procedure TfrmDyePCDetailsList.tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); -begin -// if ADOQuerymain.IsEmpty then -// exit; - - frmMachTaskList := TfrmMachTaskList.create(self); - with frmMachTaskList do - begin - fBegTime := Self.CDS_1.FieldByName('time').AsString; - fMCName := Self.Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName; - fText := self.CDS_1.FieldByName(fMCName).AsString; - showModal; - free; - end; - initgrid1(); -end; - procedure TfrmDyePCDetailsList.tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +var + mIsConflict: Variant; begin - inherited; - ACanvas.Font.Size := 7; + // ȡֵֶ + mIsConflict := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('IsConflict').Index]; + + if AViewInfo.GridRecord.Selected then + begin + ADone := False; // ÿؼʹĬϵѡʽ + Exit; + end; + + + // òͬ״̬ɫ + if mIsConflict = 1 then // δƻ + begin + ACanvas.Brush.Color := clRed; // ɫ + ACanvas.Font.Color := clWindowText; + ACanvas.Font.Style := [fsBold]; + end + else // Ĭ + begin + ACanvas.Brush.Color := clWindow; + ACanvas.Font.Color := clWindowText; + ACanvas.Font.Style := []; + end; + + // ҪԶɣȡע + // ADone := True; end; procedure TfrmDyePCDetailsList.Tv1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); @@ -903,6 +1375,12 @@ begin end; +procedure TfrmDyePCDetailsList.Tv2CellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +begin +// ShowMessage(CDS_2.FieldByName('isComplete').asString); + +end; + procedure TfrmDyePCDetailsList.Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); var PC_FLAG, isComplete: Variant; @@ -911,8 +1389,27 @@ begin PC_FLAG := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('PC_FLAG').Index]; isComplete := AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('isComplete').Index]; + if AViewInfo.GridRecord.Selected then + begin + ADone := False; // ÿؼʹĬϵѡʽ + Exit; + end; + + // òͬ״̬ɫ - if VarIsNull(PC_FLAG) or (PC_FLAG = 0) then // δƻ + if (not VarIsNull(isComplete)) and (isComplete = true) then // Ʒ + begin + ACanvas.Brush.Color := $00E0FFE0; // dzɫ + ACanvas.Font.Color := $00008000; + ACanvas.Font.Style := [fsBold]; + end + else if (not VarIsNull(isComplete)) and (isComplete = False) then // һ + begin + ACanvas.Brush.Color := $00E0E0E0; // dzɫ + ACanvas.Font.Color := clGray; + ACanvas.Font.Style := [fsBold]; // + end + else if VarIsNull(PC_FLAG) or (PC_FLAG = 0) then // δƻ begin ACanvas.Brush.Color := $00CCCCFF; // dzɫ ACanvas.Font.Color := clRed; @@ -924,18 +1421,6 @@ begin ACanvas.Font.Color := clWindowText; // Ĭϴıɫ ACanvas.Font.Style := []; end - else if (not VarIsNull(isComplete)) and (isComplete = 0) then // һ - begin - ACanvas.Brush.Color := $00E0E0E0; // dzɫ - ACanvas.Font.Color := clGray; - ACanvas.Font.Style := [fsBold]; // - end - else if (not VarIsNull(isComplete)) and (isComplete = 1) then // Ʒ - begin - ACanvas.Brush.Color := $00E0FFE0; // dzɫ - ACanvas.Font.Color := $00008000; - ACanvas.Font.Style := [fsBold]; - end else // Ĭ begin ACanvas.Brush.Color := clWindow; @@ -1025,33 +1510,206 @@ end; procedure TfrmDyePCDetailsList.TBFindClick(Sender: TObject); begin + InitGrid1(); if ADOQueryMain.Active then begin +// ShowMessage(IntToStr(ADOQueryMain.RecordCount)); SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); +// ShowMessage(IntToStr(ADOQueryMain.RecordCount)); SCreateCDS(ADOQueryMain, CDS_1); SInitCDSData(ADOQueryMain, CDS_1); end; end; procedure TfrmDyePCDetailsList.TbMoveDownClick(Sender: TObject); +var + mGlideID1, mGlideID2: string; + mConflict: Integer; begin if SaveMove('') then - ShowMessage('Ƴɹ') + begin + /////////////////////////////ʱͻ///////////////////// + with ADOQueryBaseCmd do + begin + Close; + sql.Clear; + sql.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + sql.Add(' and PC_FLAG = 1'); + Open; + end; + ADOQueryBaseCmd.First; + while not ADOQueryBaseCmd.Eof do + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and endTime > ' + quotedStr(ADOQueryBaseCmd.FieldByName('BegTime').AsString)); + SQL.Add(' and GlideNo < ' + QuotedStr(Trim(ADOQueryBaseCmd.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + + mConflict := 1; + + end; + end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and BegTime < ' + quotedStr(ADOQueryBaseCmd.FieldByName('EndTime').AsString)); + SQL.Add(' and GlideNo > ' + QuotedStr(Trim(ADOQueryBaseCmd.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + mConflict := 1; + end; + end; + + if mConflict = 0 then + begin + ADOQueryBaseCmd.Edit; + ADOQueryBaseCmd.FieldByName('IsConflict').Value := 0; + ADOQueryBaseCmd.Post; + end + else + begin + ADOQueryBaseCmd.Edit; + ADOQueryBaseCmd.FieldByName('IsConflict').Value := 1; + ADOQueryBaseCmd.Post; + end; + +///////////////////////////////////////////// + ADOQueryBaseCmd.Next; + end; + + if not CDS_1.IsEmpty then + mGlideID1 := Trim(CDS_1.FieldByName('GlideID').AsString) + else + mGlideID1 := ''; + if not CDS_2.IsEmpty then + mGlideID2 := Trim(CDS_2.FieldByName('GlideID').AsString) + else + mGlideID2 := ''; + initGrid1(); + initGrid2(); + // Զλԭ¼ + if mGlideID1 <> '' then + CDS_1.Locate('GlideID', mGlideID1, []); + // Զλԭ¼ + if mGlideID2 <> '' then + CDS_2.Locate('GlideID', mGlideID2, []); + ShowMessage('Ƴɹ'); + end else ShowMessage('ʧܣ'); end; procedure TfrmDyePCDetailsList.TbMoveUpClick(Sender: TObject); +var + mGlideID1, mGlideID2: string; + mConflict: Integer; begin if SaveMove('') then - ShowMessage('Ƴɹ') + begin + + /////////////////////////////ʱͻ///////////////////// + with ADOQueryBaseCmd do + begin + Close; + sql.Clear; + sql.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + sql.Add(' and PC_FLAG = 1'); + Open; + end; + ADOQueryBaseCmd.First; + while not ADOQueryBaseCmd.Eof do + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and endTime > ' + quotedStr(ADOQueryBaseCmd.FieldByName('BegTime').AsString)); + SQL.Add(' and GlideNo < ' + QuotedStr(Trim(ADOQueryBaseCmd.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + + mConflict := 1; + + end; + end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(CDS_1.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and BegTime < ' + quotedStr(ADOQueryBaseCmd.FieldByName('EndTime').AsString)); + SQL.Add(' and GlideNo > ' + QuotedStr(Trim(ADOQueryBaseCmd.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + mConflict := 1; + end; + end; + + if mConflict = 0 then + begin + ADOQueryBaseCmd.Edit; + ADOQueryBaseCmd.FieldByName('IsConflict').Value := 0; + ADOQueryBaseCmd.Post; + end + else + begin + ADOQueryBaseCmd.Edit; + ADOQueryBaseCmd.FieldByName('IsConflict').Value := 1; + ADOQueryBaseCmd.Post; + end; + + ADOQueryBaseCmd.Next; + end; + + + ///////////////////////////////////////////// + if not CDS_1.IsEmpty then + mGlideID1 := Trim(CDS_1.FieldByName('GlideID').AsString) + else + mGlideID1 := ''; + if not CDS_2.IsEmpty then + mGlideID2 := Trim(CDS_2.FieldByName('GlideID').AsString) + else + mGlideID2 := ''; + initGrid1(); + initGrid2(); + // Զλԭ¼ + if mGlideID1 <> '' then + CDS_1.Locate('GlideID', mGlideID1, []); + // Զλԭ¼ + if mGlideID2 <> '' then + CDS_2.Locate('GlideID', mGlideID2, []); + ShowMessage('Ƴɹ'); + end else ShowMessage('ʧܣ'); end; -procedure TfrmDyePCDetailsList.pcidChange(Sender: TObject); +procedure TfrmDyePCDetailsList.pcidKeyPress(Sender: TObject; var Key: Char); begin - TBFind.Click; + if Key = #13 then + begin + InitGrid1(); + end; + end; procedure TfrmDyePCDetailsList.PRTColorChange(Sender: TObject); @@ -1093,5 +1751,97 @@ begin end; +procedure TfrmDyePCDetailsList.TbEditClick(Sender: TObject); +var + mConflict: Integer; +begin + + if CDS_1.IsEmpty then + begin + Exit; + end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.add('select * from PCAboutTime where time = ' + QuotedStr(Trim(CDS_1.FieldByName('begtime').AsString))); + Open; + end; +// + frmMachTaskList := TfrmMachTaskList.create(self); + with frmMachTaskList do + begin + fBegTime := Self.CDS_1.FieldByName('Begtime').AsString; + fMCName := Self.MCName.Text; + fText := self.ADOQueryCmd.FieldByName(fMCName).AsString; + showModal; + free; + end; + + + /////////////////////////////ʱͻ///////////////////// + with ADOQueryBaseCmd do + begin + Close; + sql.Clear; + sql.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(Self.CDS_1.FieldByName('PCID').AsString))); + sql.Add(' and PC_FLAG = 1'); + Open; + end; + ADOQueryBaseCmd.First; + while not ADOQueryBaseCmd.Eof do + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(Self.CDS_1.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and endTime > ' + quotedStr(ADOQueryBaseCmd.FieldByName('BegTime').AsString)); + SQL.Add(' and GlideNo < ' + QuotedStr(Trim(ADOQueryBaseCmd.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + + mConflict := 1; + + end; + end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add(' select * from Dye_Plan_Glide where PCID = ' + QuotedStr(Trim(Self.CDS_1.FieldByName('PCID').AsString))); + SQL.Add(' and PC_FLAG = 1 and BegTime < ' + quotedStr(ADOQueryBaseCmd.FieldByName('EndTime').AsString)); + SQL.Add(' and GlideNo > ' + QuotedStr(Trim(ADOQueryBaseCmd.FieldByName('GlideNo').AsString))); +// ShowMessage(sql.Text); + open; + if not IsEmpty then + begin + mConflict := 1; + end; + end; + + if mConflict = 0 then + begin + ADOQueryBaseCmd.Edit; + ADOQueryBaseCmd.FieldByName('IsConflict').Value := 0; + ADOQueryBaseCmd.Post; + end + else + begin + ADOQueryBaseCmd.Edit; + ADOQueryBaseCmd.FieldByName('IsConflict').Value := 1; + ADOQueryBaseCmd.Post; + end; + + ADOQueryBaseCmd.Next; + end; + + initgrid1(); +end; + end. diff --git a/F04染色刷卡/U_DyePCList.dfm b/F04染色刷卡/U_DyePCList.dfm index 0eb2646..53a8624 100644 --- a/F04染色刷卡/U_DyePCList.dfm +++ b/F04染色刷卡/U_DyePCList.dfm @@ -8,6 +8,8 @@ inherited frmDyePCList: TfrmDyePCList Font.Name = 'Tahoma' OldCreateOrder = True WindowState = wsMaximized + OnKeyDown = FormKeyDown + ExplicitLeft = -312 ExplicitWidth = 1196 ExplicitHeight = 623 PixelsPerInch = 96 @@ -259,6 +261,8 @@ inherited frmDyePCList: TfrmDyePCList TabOrder = 3 LookAndFeel.ScrollbarMode = sbmHybrid LookAndFeel.ScrollMode = scmDefault + ExplicitLeft = -40 + ExplicitTop = 89 object tv1: TcxGridDBTableView Tag = 9999 DragMode = dmAutomatic diff --git a/F04染色刷卡/U_DyePCList.pas b/F04染色刷卡/U_DyePCList.pas index 9932429..a3a60b7 100644 --- a/F04染色刷卡/U_DyePCList.pas +++ b/F04染色刷卡/U_DyePCList.pas @@ -111,6 +111,7 @@ type procedure tv1JRG3StylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; var AStyle: TcxStyle); procedure tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); procedure TbUpdateTimeClick(Sender: TObject); + procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); private FLeft, FTop: Integer; @@ -138,6 +139,16 @@ begin frmDyePCList := nil; end; +procedure TfrmDyePCList.FormKeyDown(Sender: TObject; var Key: Word; + Shift: TShiftState); +begin + if Key = VK_ESCAPE then // VK_ESCAPE ESC ij + begin + Key := 0; // ֹ + Close; // ModalResult := mrCancel; + end; +end; + procedure TfrmDyePCList.FormClose(Sender: TObject; var Action: TCloseAction); begin inherited; @@ -255,6 +266,8 @@ begin end; procedure TfrmDyePCList.tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +var + mGlideID1 : string; begin // if ADOQuerymain.IsEmpty then // exit; @@ -268,7 +281,21 @@ begin showModal; free; end; - initgrid(); + + + if not CDS_Main.IsEmpty then + mGlideID1 := Trim(CDS_Main.FieldByName('time').AsString) + else + mGlideID1 := ''; + + initGrid(); + + // Զλԭ¼ + if mGlideID1 <> '' then + CDS_Main.Locate('time', mGlideID1, []); + + + end; procedure TfrmDyePCList.tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); @@ -736,6 +763,7 @@ begin BegTime.Time := EncodeTime(0, 0, 0, 0); // 8 endTime.Time := EncodeTime(0, 0, 0, 0); // 6 initgrid(); + KeyPreview := True; // ȷԤ end; procedure TfrmDyePCList.TBExportClick(Sender: TObject); diff --git a/F04染色刷卡/U_DyePCMachineList.dfm b/F04染色刷卡/U_DyePCMachineList.dfm index c784cfb..406befe 100644 --- a/F04染色刷卡/U_DyePCMachineList.dfm +++ b/F04染色刷卡/U_DyePCMachineList.dfm @@ -8,6 +8,7 @@ inherited frmDyePCMachineList: TfrmDyePCMachineList Font.Name = 'Tahoma' OldCreateOrder = True WindowState = wsMaximized + OnKeyDown = FormKeyDown ExplicitWidth = 1196 ExplicitHeight = 623 PixelsPerInch = 96 @@ -288,6 +289,7 @@ inherited frmDyePCMachineList: TfrmDyePCMachineList TabOrder = 3 LookAndFeel.ScrollbarMode = sbmHybrid LookAndFeel.ScrollMode = scmDefault + ExplicitTop = 103 object tv1: TcxGridDBTableView Tag = 9999 DragMode = dmAutomatic diff --git a/F04染色刷卡/U_DyePCMachineList.pas b/F04染色刷卡/U_DyePCMachineList.pas index dec6112..673b769 100644 --- a/F04染色刷卡/U_DyePCMachineList.pas +++ b/F04染色刷卡/U_DyePCMachineList.pas @@ -90,6 +90,7 @@ type procedure MCNOChange(Sender: TObject); procedure TbAddClick(Sender: TObject); procedure TbDelClick(Sender: TObject); + procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); // procedure tv1CustomDrawCell(Sender: TcxCustomGridTableView; @@ -122,6 +123,16 @@ begin frmDyePCMachineList := nil; end; +procedure TfrmDyePCMachineList.FormKeyDown(Sender: TObject; var Key: Word; + Shift: TShiftState); +begin + if Key = VK_ESCAPE then // VK_ESCAPE ESC ij + begin + Key := 0; // ֹ + Close; // ModalResult := mrCancel; + end; +end; + procedure TfrmDyePCMachineList.FormClose(Sender: TObject; var Action: TCloseAction); begin inherited; @@ -336,6 +347,7 @@ begin MCNO.Text := 'ϴ'; MCName.Text := 'CCQX1'; initgrid(); + KeyPreview := True; end; procedure TfrmDyePCMachineList.TBExportClick(Sender: TObject); diff --git a/F04染色刷卡/U_MachTaskList.dfm b/F04染色刷卡/U_MachTaskList.dfm index 4206a27..801b888 100644 --- a/F04染色刷卡/U_MachTaskList.dfm +++ b/F04染色刷卡/U_MachTaskList.dfm @@ -143,7 +143,7 @@ object frmMachTaskList: TfrmMachTaskList Properties.Kind = ckDateTime Properties.OnValidate = tv1BegTimePropertiesValidate HeaderAlignmentHorz = taCenter - Width = 70 + Width = 71 end object Tv1MCName: TcxGridDBColumn Caption = #26426#21488#21517#31216 @@ -195,7 +195,7 @@ object frmMachTaskList: TfrmMachTaskList Height = 38 AutoSize = True ButtonHeight = 38 - ButtonWidth = 107 + ButtonWidth = 114 Caption = 'ToolBar1' GradientEndColor = clWindow Images = DataLink_DyeProcess.ImageList_new32 @@ -212,7 +212,7 @@ object frmMachTaskList: TfrmMachTaskList OnClick = TrefreshClick end object ToolButton1: TToolButton - Left = 79 + Left = 71 Top = 0 AutoSize = True Caption = #19978#31227 @@ -221,7 +221,7 @@ object frmMachTaskList: TfrmMachTaskList OnClick = ToolButton1Click end object ToolButton2: TToolButton - Left = 158 + Left = 142 Top = 0 AutoSize = True Caption = #19979#31227 @@ -230,7 +230,7 @@ object frmMachTaskList: TfrmMachTaskList OnClick = ToolButton2Click end object TbSave: TToolButton - Left = 237 + Left = 213 Top = 0 AutoSize = True Caption = #20445#23384 @@ -238,7 +238,7 @@ object frmMachTaskList: TfrmMachTaskList OnClick = TbSaveClick end object TbEditSave: TToolButton - Left = 316 + Left = 284 Top = 0 AutoSize = True Caption = #20462#25913#20445#23384 @@ -246,7 +246,7 @@ object frmMachTaskList: TfrmMachTaskList OnClick = TbEditSaveClick end object TBDel: TToolButton - Left = 427 + Left = 379 Top = 0 AutoSize = True Caption = #21024#38500#20445#23384 @@ -254,7 +254,7 @@ object frmMachTaskList: TfrmMachTaskList OnClick = TBDelClick end object Tconfirm: TToolButton - Left = 538 + Left = 474 Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 @@ -262,13 +262,27 @@ object frmMachTaskList: TfrmMachTaskList OnClick = TconfirmClick end object Tclose: TToolButton - Left = 649 + Left = 569 Top = 0 AutoSize = True Caption = #20851#38381 ImageIndex = 7 OnClick = TcloseClick end + object ToolButton3: TToolButton + Left = 640 + Top = 0 + Caption = 'ToolButton3' + ImageIndex = 8 + OnClick = ToolButton3Click + end + object ToolButton4: TToolButton + Left = 754 + Top = 0 + Caption = 'ToolButton4' + ImageIndex = 9 + OnClick = ToolButton4Click + end end object Panel1: TPanel Left = 0 @@ -279,6 +293,7 @@ object frmMachTaskList: TfrmMachTaskList BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 2 + ExplicitTop = 32 object Label1: TLabel Left = 24 Top = 18 @@ -461,6 +476,13 @@ object frmMachTaskList: TfrmMachTaskList Options.Editing = False Width = 80 end + object Tv2All_rate: TcxGridDBColumn + Caption = #21161#21058#27604#20363 + DataBinding.FieldName = 'All_rate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv2ALL_temperature6: TcxGridDBColumn Caption = '6#'#28201#24230 DataBinding.FieldName = 'ALL_temperature6' diff --git a/F04染色刷卡/U_MachTaskList.pas b/F04染色刷卡/U_MachTaskList.pas index 813d0d3..cf11eee 100644 --- a/F04染色刷卡/U_MachTaskList.pas +++ b/F04染色刷卡/U_MachTaskList.pas @@ -77,6 +77,9 @@ type Panel4: TPanel; Panel5: TPanel; Tv2isComplete: TcxGridDBColumn; + Tv2All_rate: TcxGridDBColumn; + ToolButton3: TToolButton; + ToolButton4: TToolButton; procedure TcloseClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); @@ -95,6 +98,8 @@ type procedure Tv2GlideNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Tv1c_colorPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); + procedure ToolButton3Click(Sender: TObject); + procedure ToolButton4Click(Sender: TObject); private procedure initGrid(); @@ -249,8 +254,19 @@ begin ADOQueryList.Locate('taskid', FTaskID, []); end; +procedure TfrmMachTaskList.ToolButton3Click(Sender: TObject); +begin + ShowMessage(CDS_1.FieldByName('BegTime').AsString); +end; + +procedure TfrmMachTaskList.ToolButton4Click(Sender: TObject); +begin + ShowMessage(CDS_1.FieldByName('MCName').asString); +end; + procedure TfrmMachTaskList.TbEditSaveClick(Sender: TObject); begin + C_Name.SetFocus; if not CheckDate then Exit; @@ -352,8 +368,14 @@ begin open; if not IsEmpty then begin - Application.MessageBox('ʱγͻ', 'ʾϢ', MB_OK); - Exit; + if Application.MessageBox('ʱγͻǷ', 'ʾϢ', MB_OKCANCEL + MB_ICONQUESTION) = IDOK then + begin + + end + else + begin + Exit; + end; end; end; @@ -368,8 +390,14 @@ begin open; if not IsEmpty then begin - Application.MessageBox('ʱγͻ', 'ʾϢ', MB_OK); - Exit; + if Application.MessageBox('ʱγͻǷ', 'ʾϢ', MB_OKCANCEL + MB_ICONQUESTION) = IDOK then + begin + + end + else + begin + Exit; + end; end; end; Result := True; @@ -455,7 +483,6 @@ begin mNewValue := mNewValue + '' + CDS_1.FieldByName('gj_number').AsString + #13; mNewValue := mNewValue + ':' + CDS_1.FieldByName('gj_speed').AsString + #13; mNewValue := mNewValue + '¶6#:' + CDS_1.FieldByName('gj_temperature6').AsString + #13; - end else if CDS_1.FieldByName('PSType').AsString = '' then begin @@ -468,7 +495,7 @@ begin mNewValue := mNewValue + '' + #13; end; //////////////////////ʾ - mNewValue := mNewValue + ':' + CDS_1.FieldByName('All_zhuji').AsString + #13; + mNewValue := mNewValue + ':' + CDS_1.FieldByName('All_zhuji').AsString + ' ' + CDS_1.FieldByName('All_rate').AsString + #13; mNewValue := mNewValue + CDS_1.FieldByName('PCID').AsString + #13; mNewValue := mNewValue + CDS_1.FieldByName('GlideID').AsString; @@ -483,7 +510,6 @@ begin Parameters.ParamByName('NewValue').Value := mNewValue; Parameters.ParamByName('StartTime').Value := mStartTime; Parameters.ParamByName('LoopNum').Value := mLoopNum; - ExecSQL; end; @@ -538,7 +564,6 @@ begin ADOQueryCmd.Next; end; - end; Next; end; diff --git a/F05染色检验/DyeInsp.dproj.local b/F05染色检验/DyeInsp.dproj.local index c76782e..b69581d 100644 --- a/F05染色检验/DyeInsp.dproj.local +++ b/F05染色检验/DyeInsp.dproj.local @@ -1,38 +1,38 @@  - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.664,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas= 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 2025/10/30 16:43:17.000.471,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F05染色检验\U_DyeCardRoll.pas diff --git a/F05染色检验/DyeInsp.identcache b/F05染色检验/DyeInsp.identcache index 4f3c04d..33d22c8 100644 Binary files a/F05染色检验/DyeInsp.identcache and b/F05染色检验/DyeInsp.identcache differ diff --git a/F05染色检验/DyeInspLogin.dproj.local b/F05染色检验/DyeInspLogin.dproj.local index e2843ae..8a45a34 100644 --- a/F05染色检验/DyeInspLogin.dproj.local +++ b/F05染色检验/DyeInspLogin.dproj.local @@ -21,6 +21,6 @@ - 1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj + 1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj diff --git a/F05染色检验/DyeInspLogin.identcache b/F05染色检验/DyeInspLogin.identcache index da5bc7b..948741f 100644 Binary files a/F05染色检验/DyeInspLogin.identcache and b/F05染色检验/DyeInspLogin.identcache differ diff --git a/F05染色检验/U_DyeCardRoll.dfm b/F05染色检验/U_DyeCardRoll.dfm index 36cd685..a72a4e5 100644 --- a/F05染色检验/U_DyeCardRoll.dfm +++ b/F05染色检验/U_DyeCardRoll.dfm @@ -246,16 +246,16 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll Styles.Header = DataLink_DyeInsp.Default Styles.Inactive = DataLink_DyeInsp.SHuangSe Styles.Selection = DataLink_DyeInsp.SHuangSe - object Tv1RollNumber: TcxGridDBColumn - Caption = #21367#26729#21495 - DataBinding.FieldName = 'RollNumber' + object Tv1OrderNo: TcxGridDBColumn + Caption = #35745#21010#21333#21495 + DataBinding.FieldName = 'OrderNo' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end - object Tv1OrderNo: TcxGridDBColumn - Caption = #35745#21010#21333#21495 - DataBinding.FieldName = 'OrderNo' + object Tv1KaZu: TcxGridDBColumn + Caption = #21345#32452#21495 + DataBinding.FieldName = 'KaZu' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 @@ -267,6 +267,55 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1finishDescription: TcxGridDBColumn + Caption = #21518#25972#29702#35201#27714 + DataBinding.FieldName = 'finishDescription' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 100 + end + object Tv1GlideNo: TcxGridDBColumn + Caption = #24037#24207#32534#21495 + DataBinding.FieldName = 'GlideNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1GlideName: TcxGridDBColumn + Caption = #24037#24207#21517#31216 + DataBinding.FieldName = 'GlideName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1RollNumber: TcxGridDBColumn + Caption = #21367#26729#21495 + DataBinding.FieldName = 'RollNumber' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1RollMeter: TcxGridDBColumn + Caption = #31859#25968 + DataBinding.FieldName = 'RollMeter' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end + object Tv1KaZuQty: TcxGridDBColumn + Caption = #21345#32452#22383#24067#31859#25968 + DataBinding.FieldName = 'KaZuQty' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 131 + end + object Tv1KaZuPiece: TcxGridDBColumn + Caption = #21345#32452#22383#24067#20214#25968 + DataBinding.FieldName = 'KaZuPiece' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 134 + end object Tv1F_Name: TcxGridDBColumn Caption = #22383#24067#21517#31216 DataBinding.FieldName = 'F_Name' @@ -323,27 +372,6 @@ inherited frmDyeCardRoll: TfrmDyeCardRoll HeaderAlignmentHorz = taCenter Width = 80 end - object Tv1KaZu: TcxGridDBColumn - Caption = #21345#32452#21495 - DataBinding.FieldName = 'KaZu' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 80 - end - object Tv1KaZuPiece: TcxGridDBColumn - Caption = #21345#32452#21305#25968 - DataBinding.FieldName = 'KaZuPiece' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 80 - end - object Tv1KaZuQty: TcxGridDBColumn - Caption = #21345#32452#25968#37327 - DataBinding.FieldName = 'KaZuQty' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Width = 80 - end object Tv1C_Width: TcxGridDBColumn Caption = #20135#21697#38376#24133 DataBinding.FieldName = 'C_Width' diff --git a/F05染色检验/U_DyeCardRoll.pas b/F05染色检验/U_DyeCardRoll.pas index af82ac8..bc7d1a4 100644 --- a/F05染色检验/U_DyeCardRoll.pas +++ b/F05染色检验/U_DyeCardRoll.pas @@ -84,6 +84,10 @@ type Tv1DTMPSlist: TcxGridDBColumn; Tv1CINote: TcxGridDBColumn; Tv1C_Color: TcxGridDBColumn; + Tv1finishDescription: TcxGridDBColumn; + Tv1GlideNo: TcxGridDBColumn; + Tv1GlideName: TcxGridDBColumn; + Tv1RollMeter: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -235,7 +239,6 @@ end; procedure TfrmDyeCardRoll.TBCloseClick(Sender: TObject); begin Close; - end; procedure TfrmDyeCardRoll.InitGrid(); @@ -251,6 +254,7 @@ begin sql.Add('select A.* '); sql.Add('from V_Dye_Card_Roll A'); sql.Add(' where 1=1'); + // case cxTabControl1.TabIndex of // 0: // begin @@ -278,7 +282,11 @@ begin //// sql.Add(' and A.Workshop=''' + trim(FWorkshop) + ''' '); // if Trim(canshu1) = '¼' then // sql.Add('and Filler=' + QuotedStr(Trim(DName))); + sql.Add(' order By KaZu ,GlideNo'); //// ShowMessage(sql.Text); +/// +/// +/// Open; end; SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); diff --git a/F05染色检验/U_DyeClothInspList.dfm b/F05染色检验/U_DyeClothInspList.dfm index 359f9fa..1d0972e 100644 --- a/F05染色检验/U_DyeClothInspList.dfm +++ b/F05染色检验/U_DyeClothInspList.dfm @@ -7,7 +7,6 @@ inherited frmDyeClothInspList: TfrmDyeClothInspList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -122 ExplicitWidth = 1487 ExplicitHeight = 621 PixelsPerInch = 96 diff --git a/F05染色检验/U_DyeClothInspList.pas b/F05染色检验/U_DyeClothInspList.pas index adcb584..46aad1c 100644 --- a/F05染色检验/U_DyeClothInspList.pas +++ b/F05染色检验/U_DyeClothInspList.pas @@ -209,8 +209,8 @@ begin if IsJYTime.Checked then begin - WSql := WSql + ' and A.Filltime>' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)); - WSql := WSql + ' and A.Filltime<=' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)); + WSql := WSql + ' and A.checktime>' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)); + WSql := WSql + ' and A.checktime<=' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)); end else begin diff --git a/F05染色检验/testDll.identcache b/F05染色检验/testDll.identcache index 131539d..9988363 100644 Binary files a/F05染色检验/testDll.identcache and b/F05染色检验/testDll.identcache differ diff --git a/F06染色成品仓库/DyeClothStk.dproj.local b/F06染色成品仓库/DyeClothStk.dproj.local index a86fd15..a90d104 100644 --- a/F06染色成品仓库/DyeClothStk.dproj.local +++ b/F06染色成品仓库/DyeClothStk.dproj.local @@ -8,35 +8,35 @@ 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.755,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.783,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\Unit1.pas= + 1899/12/30 00:00:00.000.845,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899/12/30 00:00:00.000.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.dfm 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899/12/30 00:00:00.000.783,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\Unit1.pas= 1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.443,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothWaitStorage.pas 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.845,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas + 1899/12/30 00:00:00.000.755,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.361,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanSel.pas 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.420,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\DyeClothStk.dproj - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.537,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.045,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothPSI.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899/12/30 00:00:00.000.710,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothIOFlow.pas 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 2025/11/01 16:37:51.000.144,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 2025/11/04 12:26:10.000.642,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F06染色成品仓库\U_DyeClothOutPut.pas 2025/11/04 12:30:50.000.944,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F06染色成品仓库\U_DyeClothStkSel.pas diff --git a/F06染色成品仓库/U_DyeClothInList.dfm b/F06染色成品仓库/U_DyeClothInList.dfm index 52ae15c..16e7b08 100644 --- a/F06染色成品仓库/U_DyeClothInList.dfm +++ b/F06染色成品仓库/U_DyeClothInList.dfm @@ -319,6 +319,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList AutoSize = True BorderStyle = bsSingle TabOrder = 2 + ExplicitTop = 111 DesignSize = ( 1536 23) @@ -427,6 +428,7 @@ inherited frmDyeClothInList: TfrmDyeClothInList ParentFont = False PopupMenu = PM_1 TabOrder = 3 + ExplicitTop = 134 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/F06染色成品仓库/U_DyeClothInList.pas b/F06染色成品仓库/U_DyeClothInList.pas index 313afd7..a50af33 100644 --- a/F06染色成品仓库/U_DyeClothInList.pas +++ b/F06染色成品仓库/U_DyeClothInList.pas @@ -296,7 +296,7 @@ begin begin if CDS_1.fieldbyname('SSel').AsBoolean then begin - MCIIDS := MCIIDS + (Trim(CDS_1.fieldbyname('CIID').AsString)) + ','; + MCIIDS := MCIIDS + (Trim(CDS_1.fieldbyname('StkID').AsString)) + ','; MIOIDS := MIOIDS + (Trim(CDS_1.fieldbyname('IOID').AsString)) + ','; MSTKIDS := MSTKIDS + (Trim(CDS_1.fieldbyname('STKID').AsString)) + ','; MPCIDS := MPCIDS + (Trim(CDS_1.fieldbyname('PCID').AsString)) + ','; @@ -336,7 +336,7 @@ begin begin Close; Sql.Clear; - Sql.Add('exec P_Dye_Cloth_ReIn '); + Sql.Add('exec P_Dye_Cloth_ReIn_cai '); Sql.Add('@StkIds=' + quotedstr(trim(MSTKIDS))); Sql.Add(',@IOIDS=' + quotedstr(trim(MIOIDS))); Sql.Add(',@FillId=' + quotedstr(trim(dcode))); @@ -364,13 +364,13 @@ begin ExecSQL; end; ADOQueryCmd.Connection.CommitTrans; - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('exec P_Dye_Card_PSC '); - execsql; - end; +// with ADOQueryCmd do +// begin +// Close; +// sql.Clear; +// sql.Add('exec P_Dye_Card_PSC '); +// execsql; +// end; InitGrid(); except ADOQueryCmd.Connection.RollbackTrans;