diff --git a/E03梭织坯布检验/TatInsp.dproj.local b/E03梭织坯布检验/TatInsp.dproj.local index ac18d26..b085344 100644 --- a/E03梭织坯布检验/TatInsp.dproj.local +++ b/E03梭织坯布检验/TatInsp.dproj.local @@ -1,49 +1,49 @@  - 1899/12/30 00:00:00.000.183,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.pas 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.638,=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.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.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.183,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.pas 1899/12/30 00:00:00.000.367,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm + 1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.pas + 1899/12/30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm 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.630,=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.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.dfm - 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.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.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.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.292,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899/12/30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas 1899/12/30 00:00:00.000.995,=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatClothInspList.pas 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas - 1899/12/30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.pas + 1899/12/30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.pas + 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.099,=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.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm - 1899/12/30 00:00:00.000.117,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\KnitInsp.dproj - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj + 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.pas + 1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj - 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.292,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899/12/30 00:00:00.000.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.dfm + 1899/12/30 00:00:00.000.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj + 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 2025/11/24 13:58:34.000.809,=D:\Dp10Repo\项目代码\D10szXIANGYING\E03梭织坯布检验\U_TatMachCutHZList.pas 2025/11/24 15:19:14.000.013,=D:\Dp10Repo\项目代码\D10szXIANGYING\E03梭织坯布检验\U_TatClothInspHZList.pas 2025/12/19 14:11:54.000.060,=D:\Dp10Repo\项目代码\D10szXIANGYING\E03梭织坯布检验\U_TatInspSHHZ.pas diff --git a/E03梭织坯布检验/TatInspLogin.dproj.local b/E03梭织坯布检验/TatInspLogin.dproj.local index 6bcb841..e379b49 100644 --- a/E03梭织坯布检验/TatInspLogin.dproj.local +++ b/E03梭织坯布检验/TatInspLogin.dproj.local @@ -1,27 +1,27 @@  - - - - - - - - - - - - + + + + + + + + + + + + - 1899/12/30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj - 1899/12/30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInspLogin.dproj + 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.976,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\TatInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\DyeInspLogin.dproj diff --git a/E03梭织坯布检验/TatInspLogin.identcache b/E03梭织坯布检验/TatInspLogin.identcache index 83e3965..f9c4d47 100644 Binary files a/E03梭织坯布检验/TatInspLogin.identcache and b/E03梭织坯布检验/TatInspLogin.identcache differ diff --git a/E03梭织坯布检验/U_TatClothInspHZList.dfm b/E03梭织坯布检验/U_TatClothInspHZList.dfm index c225742..9dd359d 100644 --- a/E03梭织坯布检验/U_TatClothInspHZList.dfm +++ b/E03梭织坯布检验/U_TatClothInspHZList.dfm @@ -7,6 +7,8 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList FormStyle = fsMDIChild Position = poScreenCenter Visible = True + ExplicitLeft = -689 + ExplicitTop = -14 ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 @@ -390,6 +392,10 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList end item Kind = skSum + end + item + Kind = skSum + Column = Tv1SHMeter end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False @@ -641,6 +647,14 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList DataBinding.IsNullValueType = True Visible = False end + object Tv1SHMeter: TcxGridDBColumn + Caption = #25439#32791#31859#25968 + DataBinding.FieldName = 'SHMeter' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/E03梭织坯布检验/U_TatClothInspHZList.pas b/E03梭织坯布检验/U_TatClothInspHZList.pas index 1d5c50b..d576cbf 100644 --- a/E03梭织坯布检验/U_TatClothInspHZList.pas +++ b/E03梭织坯布检验/U_TatClothInspHZList.pas @@ -79,6 +79,7 @@ type N2: TMenuItem; N3: TMenuItem; Tv1DXMF: TcxGridDBColumn; + Tv1SHMeter: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -303,9 +304,9 @@ begin sql.Add(' ,meterall=(select sum(meter+SHMeter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo )'); sql.Add(' ,C_Widthall= ISNULL(NULLIF(MAX(ISNULL(B.C_WidthNum, 1)), 0), 1) '); - - SQL.Add(' ,qgMeter=(select sum(meter+SHMeter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo )/ISNULL(NULLIF(MAX(ISNULL(B.C_WidthNum, 1)), 0), 1) '); - + //ȥ 20260206 cai + SQL.Add(' ,qgMeter=(select sum(meter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo )/ISNULL(NULLIF(MAX(ISNULL(B.C_WidthNum, 1)), 0), 1) '); + SQL.Add(' ,SHMeter=(select sum(SHmeter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo ) '); // SQL.Add(' ,qgSL = ROUND((select sum(meter+SHMeter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo )*100 '); // sql.Add(' / ISNULL(NULLIF(MAX(ISNULL(B.C_WidthNum, 1)), 0), 1)/CAST(ISNULL(NULLIF(A.dxmeter, ''''), 1) AS DECIMAL(18,2)) , 2) '); diff --git a/E03梭织坯布检验/U_TatClothInspHZList2.dfm b/E03梭织坯布检验/U_TatClothInspHZList2.dfm index ffe0db6..71a76d6 100644 --- a/E03梭织坯布检验/U_TatClothInspHZList2.dfm +++ b/E03梭织坯布检验/U_TatClothInspHZList2.dfm @@ -6,6 +6,7 @@ inherited frmTatClothInspHZList2: TfrmTatClothInspHZList2 ClientWidth = 1540 Position = poScreenCenter WindowState = wsMaximized + ExplicitLeft = -689 ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 @@ -395,6 +396,10 @@ inherited frmTatClothInspHZList2: TfrmTatClothInspHZList2 item Kind = skSum Column = Tv1FBPF + end + item + Kind = skSum + Column = Tv1SHMeter end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False @@ -695,6 +700,14 @@ inherited frmTatClothInspHZList2: TfrmTatClothInspHZList2 Options.Editing = False Width = 80 end + object Tv1SHMeter: TcxGridDBColumn + Caption = #25439#32791#31859#25968 + DataBinding.FieldName = 'SHMeter' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end object Tv1Column19: TcxGridDBColumn Caption = #25439#32791#24179#26041 DataBinding.FieldName = 'SHpf' diff --git a/E03梭织坯布检验/U_TatClothInspHZList2.pas b/E03梭织坯布检验/U_TatClothInspHZList2.pas index fc456ed..6d675fd 100644 --- a/E03梭织坯布检验/U_TatClothInspHZList2.pas +++ b/E03梭织坯布检验/U_TatClothInspHZList2.pas @@ -88,6 +88,7 @@ type Tv1issp: TcxGridDBColumn; N2: TMenuItem; N3: TMenuItem; + Tv1SHMeter: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -316,9 +317,9 @@ begin sql.Add(' ,meterall=(select sum(meter+SHMeter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo )'); sql.Add(' ,C_Widthall= ISNULL(NULLIF(MAX(ISNULL(B.C_WidthNum, 1)), 0), 1) '); - - SQL.Add(' ,qgMeter=(select sum(meter+SHMeter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo )/ISNULL(NULLIF(MAX(ISNULL(B.C_WidthNum, 1)), 0), 1) '); - + //ȥ 20260206 cai + SQL.Add(' ,qgMeter=(select sum(meter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo )/ISNULL(NULLIF(MAX(ISNULL(B.C_WidthNum, 1)), 0), 1) '); + SQL.Add(' ,SHMeter=(select sum(SHMeter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo ) '); // SQL.Add(' ,qgSL = ROUND((select sum(meter+SHMeter) FROM Tat_Cloth_Inspect X WHERE X.pcid = A.pcid and X.BCIOID = A.BCIOID and X.GRADE<>''ѭ'' and X.CIMachNo=A.CIMachNo )*100 '); // sql.Add(' / ISNULL(NULLIF(MAX(ISNULL(B.C_WidthNum, 1)), 0), 1)/CAST(ISNULL(NULLIF(A.dxmeter, ''''), 1) AS DECIMAL(18,2)) , 2) '); diff --git a/E03梭织坯布检验/U_TatInspSHHZ.dfm b/E03梭织坯布检验/U_TatInspSHHZ.dfm index f2fa503..fb5fee9 100644 --- a/E03梭织坯布检验/U_TatInspSHHZ.dfm +++ b/E03梭织坯布检验/U_TatInspSHHZ.dfm @@ -33,6 +33,7 @@ inherited frmTatInspSHHZ: TfrmTatInspSHHZ ParentFont = False ShowCaptions = True TabOrder = 0 + ExplicitLeft = 1 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -77,6 +78,8 @@ inherited frmTatInspSHHZ: TfrmTatInspSHHZ Color = clWhite ParentBackground = False TabOrder = 1 + ExplicitLeft = 1 + ExplicitTop = 33 object Label2: TLabel Left = 70 Top = 36 @@ -219,7 +222,6 @@ inherited frmTatInspSHHZ: TfrmTatInspSHHZ Height = 495 Align = alClient TabOrder = 2 - ExplicitTop = 96 object cxGrid1: TcxGrid Left = 1 Top = 1 @@ -235,6 +237,8 @@ inherited frmTatInspSHHZ: TfrmTatInspSHHZ ParentFont = False PopupMenu = PM_1 TabOrder = 0 + ExplicitLeft = 2 + ExplicitTop = 6 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> diff --git a/E03梭织坯布检验/U_TatMachCutHZList.dfm b/E03梭织坯布检验/U_TatMachCutHZList.dfm index ac290b2..02499ca 100644 --- a/E03梭织坯布检验/U_TatMachCutHZList.dfm +++ b/E03梭织坯布检验/U_TatMachCutHZList.dfm @@ -7,7 +7,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -466 + ExplicitLeft = -689 ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 @@ -182,7 +182,6 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList ParentFont = False PopupMenu = PM_1 TabOrder = 2 - ExplicitTop = 103 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -343,6 +342,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'Carno' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column6: TcxGridDBColumn @@ -350,6 +350,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'YDJs' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 74 end object Tv1Column1: TcxGridDBColumn @@ -357,6 +358,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'Ydqty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column9: TcxGridDBColumn @@ -364,6 +366,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'xjJS' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column10: TcxGridDBColumn @@ -371,6 +374,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'xjqty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column7: TcxGridDBColumn @@ -378,6 +382,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'edJS' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column8: TcxGridDBColumn @@ -385,6 +390,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'edqty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column17: TcxGridDBColumn @@ -392,6 +398,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'csJS' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column18: TcxGridDBColumn @@ -399,6 +406,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'csqty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column13: TcxGridDBColumn @@ -406,6 +414,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'fqJS' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column14: TcxGridDBColumn @@ -413,6 +422,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'fqqty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1fbJS: TcxGridDBColumn @@ -420,6 +430,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'fbJS' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1fbqty: TcxGridDBColumn @@ -427,6 +438,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'fbqty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1Column19: TcxGridDBColumn @@ -434,6 +446,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'SHpf' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 71 end object Tv1qgMeter: TcxGridDBColumn @@ -443,6 +456,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList PropertiesClassName = 'TcxCurrencyEditProperties' Properties.DisplayFormat = '0.00' HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1qgMeterGQ: TcxGridDBColumn @@ -450,6 +464,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'qgMeterGQ' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1qgMeterAll: TcxGridDBColumn @@ -457,6 +472,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'qgMeterAll' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1ZJJS: TcxGridDBColumn @@ -464,6 +480,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'ZJJS' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end object Tv1ZJqty: TcxGridDBColumn @@ -471,6 +488,7 @@ inherited frmTatMachCutHZList: TfrmTatMachCutHZList DataBinding.FieldName = 'ZJqty' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 end end diff --git a/E03梭织坯布检验/testDll.identcache b/E03梭织坯布检验/testDll.identcache index da92555..293c0c8 100644 Binary files a/E03梭织坯布检验/testDll.identcache and b/E03梭织坯布检验/testDll.identcache differ diff --git a/E04梭织坯布仓库/TatClothStk.dproj.local b/E04梭织坯布仓库/TatClothStk.dproj.local index 57b931b..8f9b812 100644 --- a/E04梭织坯布仓库/TatClothStk.dproj.local +++ b/E04梭织坯布仓库/TatClothStk.dproj.local @@ -14,9 +14,9 @@ 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.930,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothInList.pas 1899/12/30 00:00:00.000.339,=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.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.094,D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\TatClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\KnitClothStk.dproj 1899/12/30 00:00:00.000.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.dfm 1899/12/30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.dfm @@ -52,7 +52,7 @@ 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.038,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\Unit1.pas= - 1899/12/30 00:00:00.000.669,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothInEdit.pas + 1899/12/30 00:00:00.000.813,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothOutList.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.659,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.dfm @@ -62,7 +62,7 @@ 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.267,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.pas 1899/12/30 00:00:00.000.231,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.pas - 1899/12/30 00:00:00.000.813,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothOutList.pas + 1899/12/30 00:00:00.000.669,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothInEdit.pas 1899/12/30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.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 diff --git a/E04梭织坯布仓库/TatClothStk.identcache b/E04梭织坯布仓库/TatClothStk.identcache index 8b062cc..d0fec4b 100644 Binary files a/E04梭织坯布仓库/TatClothStk.identcache and b/E04梭织坯布仓库/TatClothStk.identcache differ diff --git a/E04梭织坯布仓库/U_TatClothCKHZList.dfm b/E04梭织坯布仓库/U_TatClothCKHZList.dfm index 3212b0c..f1295bb 100644 --- a/E04梭织坯布仓库/U_TatClothCKHZList.dfm +++ b/E04梭织坯布仓库/U_TatClothCKHZList.dfm @@ -7,6 +7,7 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList FormStyle = fsMDIChild Position = poScreenCenter Visible = True + ExplicitTop = -14 ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 @@ -277,6 +278,8 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList ParentFont = False Style = tsFlatButtons TabOrder = 2 + ExplicitLeft = -32 + ExplicitTop = 97 object TabSheet1: TTabSheet Caption = #26377#20986#24211#21333#20986#24211 object cxGrid1: TcxGrid @@ -294,6 +297,7 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList ParentFont = False PopupMenu = PM_1 TabOrder = 0 + ExplicitTop = 3 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> @@ -380,14 +384,6 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList Options.Sorting = False Width = 66 end - object Tv1ToCoName: TcxGridDBColumn - Caption = #23458#25143 - DataBinding.FieldName = 'CoName' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end object Tv1Column3: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' @@ -593,6 +589,149 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList end end end + object TabSheet3: TTabSheet + Caption = #26377#20986#24211#21333#27719#24635'('#23458#25143')' + ImageIndex = 2 + object cxGrid3: TcxGrid + Left = 0 + Top = 0 + Width = 1532 + Height = 457 + Align = alClient + BorderStyle = cxcbsNone + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + PopupMenu = PM_3 + TabOrder = 0 + ExplicitLeft = 3 + object Tv3: TcxGridDBTableView + OnDblClick = Tv3DblClick + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + DataController.DataSource = DS_3 + DataController.Filter.AutoDataSetFilter = True + DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = < + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skCount + end + item + Kind = skSum + Column = cxGridDBColumn12 + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Format = #26816#39564#31995#25968'=#.##' + Kind = skAverage + end + item + Format = #25442#31639#31995#25968'=#.##' + Kind = skAverage + end + item + Kind = skSum + Column = cxGridDBColumn11 + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + end + item + Kind = skSum + Column = cxGridDBColumn13 + end> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsView.Footer = True + OptionsView.GroupByBox = False + OptionsView.IndicatorWidth = 30 + Styles.IncSearch = DataLink_TatClothStk.SHuangSe + Styles.Footer = DataLink_TatClothStk.Default + Styles.Header = DataLink_TatClothStk.Default + Styles.Inactive = DataLink_TatClothStk.SHuangSe + Styles.Selection = DataLink_TatClothStk.SHuangSe + object cxGridDBColumn2: TcxGridDBColumn + Caption = #36873#25321 + DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCheckBoxProperties' + Properties.ImmediatePost = True + Properties.NullStyle = nssUnchecked + HeaderAlignmentHorz = taCenter + Options.Sorting = False + Width = 66 + end + object Tv3COName: TcxGridDBColumn + Caption = #23458#25143 + DataBinding.FieldName = 'COName' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object cxGridDBColumn11: TcxGridDBColumn + Caption = #21367#25968 + DataBinding.FieldName = 'js' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object cxGridDBColumn12: TcxGridDBColumn + Caption = #31859#25968 + DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object cxGridDBColumn13: TcxGridDBColumn + Caption = #20844#26020 + DataBinding.FieldName = 'NetWeight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + end + object cxGridLevel2: TcxGridLevel + GridView = Tv3 + end + end + end end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_TatClothStk.ADOLink @@ -702,4 +841,36 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList OnClick = MenuItem4Click end end + object PM_3: TPopupMenu + Left = 160 + Top = 416 + object MenuItem5: TMenuItem + Caption = #20840#36873 + OnClick = MenuItem5Click + end + object MenuItem6: TMenuItem + Caption = #20840#24323 + OnClick = MenuItem6Click + end + object MenuItem7: TMenuItem + Caption = #22797#21046 + OnClick = MenuItem7Click + end + object MenuItem8: TMenuItem + Caption = #22797#21046#27880#33050 + OnClick = MenuItem8Click + end + end + object DS_3: TDataSource + DataSet = CDS_3 + Left = 940 + Top = 380 + end + object CDS_3: TClientDataSet + Aggregates = <> + Params = <> + BeforeOpen = CDS_1BeforeOpen + Left = 880 + Top = 372 + end end diff --git a/E04梭织坯布仓库/U_TatClothCKHZList.pas b/E04梭织坯布仓库/U_TatClothCKHZList.pas index 71c66cd..64d5271 100644 --- a/E04梭织坯布仓库/U_TatClothCKHZList.pas +++ b/E04梭织坯布仓库/U_TatClothCKHZList.pas @@ -72,7 +72,6 @@ type CDS_2: TClientDataSet; DS_2: TDataSource; GPM_2: TcxGridPopupMenu; - Tv1ToCoName: TcxGridDBColumn; Tv1issp: TcxGridDBColumn; Tv2issp: TcxGridDBColumn; N2: TMenuItem; @@ -82,6 +81,22 @@ type MenuItem2: TMenuItem; MenuItem3: TMenuItem; MenuItem4: TMenuItem; + TabSheet3: TTabSheet; + cxGrid3: TcxGrid; + Tv3: TcxGridDBTableView; + cxGridDBColumn2: TcxGridDBColumn; + cxGridDBColumn11: TcxGridDBColumn; + cxGridDBColumn12: TcxGridDBColumn; + cxGridDBColumn13: TcxGridDBColumn; + cxGridLevel2: TcxGridLevel; + PM_3: TPopupMenu; + MenuItem5: TMenuItem; + MenuItem6: TMenuItem; + MenuItem7: TMenuItem; + MenuItem8: TMenuItem; + DS_3: TDataSource; + CDS_3: TClientDataSet; + Tv3COName: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -114,6 +129,11 @@ type procedure MenuItem1Click(Sender: TObject); procedure Tv1DblClick(Sender: TObject); procedure Tv2DblClick(Sender: TObject); + procedure MenuItem5Click(Sender: TObject); + procedure MenuItem6Click(Sender: TObject); + procedure MenuItem7Click(Sender: TObject); + procedure MenuItem8Click(Sender: TObject); + procedure Tv3DblClick(Sender: TObject); private CurrentPage, RecordsNumber: Integer; lstCust: TStringList; @@ -122,6 +142,8 @@ type procedure InitGrid2(); procedure CopyColumnSummaryToClipboard(AColumn: TcxGridColumn); procedure CopyColumnSummaryToClipboard2(AColumn: TcxGridColumn); + procedure InitGrid3(); + procedure CopyColumnSummaryToClipboard3(AColumn: TcxGridColumn); { Private declarations } public canshu1: string; @@ -131,7 +153,7 @@ type implementation uses - U_DataLink, U_RTFun, U_LabelPrint, U_TatClothCKHZList2,U_TatClothCKHZList3; + U_DataLink, U_RTFun, U_LabelPrint, U_TatClothCKHZList2, U_TatClothCKHZList3; {$R *.dfm} @@ -179,8 +201,8 @@ begin sql.Clear; sql.Add('SELECT A.C_CODE,A.C_Name,A.C_GramWeight'); - sql.Add(',B.ToCoID '); - sql.Add(',COName = (select COName from BS_Company X where X.CoID = B.ToCoID)'); +// sql.Add(',B.ToCoID '); +// sql.Add(',COName = (select COName from BS_Company X where X.CoID = B.ToCoID)'); sql.Add(' ,js = count(*),Meter=sum(A.meter),NetWeight = sum(A.NetWeight) '); // sql.Add(',pf = CAST(A.C_Width AS DECIMAL(18,2))/100*sum(A.meter) '); SQL.Add(',issp=isnull(A.issp,'''') '); @@ -192,7 +214,8 @@ begin begin sql.Add(' and EXISTS ( select * from BS_Company X where X.COID = B.ToCoID and X.Saleser = ' + quotedStr(Trim(DName)) + ')'); end; - SQL.Add(' group by A.C_CODE ,A.C_GramWeight,A.C_Name,isnull(A.issp,''''),B.ToCoID'); + SQL.Add(' group by A.C_CODE ,A.C_GramWeight,A.C_Name,isnull(A.issp,'''')'); +// ,B.ToCoID SQL.Add(' order by A.C_CODE ,A.C_GramWeight'); // showmessage(sql.text); @@ -255,10 +278,64 @@ begin end; +procedure TfrmTatClothCKHZList.InitGrid3(); +var + WSql: string; +begin + + WSql := SGetFilters(Panel1, 1, 2); + if Trim(WSql) <> '' then + WSql := ' and ' + WSql; + if IsJYTime.Checked then + begin + WSql := WSql + ' and A.IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)); + WSql := WSql + ' and A.IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)); + end; + + try + ADOQueryMain.DisableControls; + + with ADOQueryMain do + begin + Filtered := False; + Close; + sql.Clear; + + sql.Add('SELECT '); + sql.Add(' B.ToCoID '); + sql.Add(',COName = (select COName from BS_Company X where X.CoID = B.ToCoID)'); + sql.Add(' ,js = count(*),Meter=sum(A.meter),NetWeight = sum(A.NetWeight) '); +// sql.Add(',pf = CAST(A.C_Width AS DECIMAL(18,2))/100*sum(A.meter) '); +// SQL.Add(',issp=isnull(A.issp,'''') '); + sql.Add(' FROM V_Tat_Cloth_IO A '); + sql.Add(' left JOIN Tat_Cloth_DR_Main B on A.IONo = B.DRMID '); + sql.Add(' where A.IONo LIKE ''RSG%'' and A.IOFlag = '''' '); + sql.Add(WSql); + if canshu1 = 'ҵ' then + begin + sql.Add(' and EXISTS ( select * from BS_Company X where X.COID = B.ToCoID and X.Saleser = ' + quotedStr(Trim(DName)) + ')'); + end; + SQL.Add(' group by B.ToCoID'); + +// showmessage(sql.text); + Open; + end; + SCreateCDS(ADOQueryMain, CDS_3); + SInitCDSData(ADOQueryMain, CDS_3); + + finally + ADOQueryMain.EnableControls; + TV1.DataController.Filter.Clear; + end; + +end; + procedure TfrmTatClothCKHZList.IsJYTimeClick(Sender: TObject); begin inherited; InitGrid(); + InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.TBRafreshClick(Sender: TObject); @@ -266,6 +343,7 @@ begin CurrentPage := 1; InitGrid(); InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.CDS_1BeforeOpen(DataSet: TDataSet); @@ -287,12 +365,16 @@ begin CurrentPage := 1; SetStatus(); InitGrid(); + InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.cxTabControl1Change(Sender: TObject); begin inherited; InitGrid(); + InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.C_NameKeyPress(Sender: TObject; var Key: Char); @@ -301,12 +383,13 @@ begin if Key = #13 then begin InitGrid(); + InitGrid2(); + InitGrid3(); end; end; procedure TfrmTatClothCKHZList.TBCloseClick(Sender: TObject); begin - Close; end; @@ -316,6 +399,7 @@ begin ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, 'Ʒ'); + ReadCxGrid(trim(self.Caption) + 'Tv3', Tv3, 'Ʒ'); CurrentPage := 1; RecordsNumber := 500; canshu1 := Trim(Self.fParameters1); @@ -324,6 +408,7 @@ begin SetStatus(); InitGrid(); InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.TBExportClick(Sender: TObject); @@ -338,6 +423,8 @@ begin end; TcxGridToExcel(Self.Caption, cxGrid1); InitGrid(); + InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.orderNoKeyPress(Sender: TObject; var Key: Char); @@ -346,6 +433,8 @@ begin begin CurrentPage := 1; InitGrid(); + InitGrid2(); + InitGrid3(); end; end; @@ -372,7 +461,7 @@ begin fBegDateTime := Self.BegDate.DateTime; // fDRMID := Self.CDS_1.FieldByName('DRMID').AsString; - fToCoID := Self.CDS_1.FieldByName('ToCoID').AsString; + fToCoID := ''; fC_Name := Self.CDS_1.FieldByName('C_Name').AsString; fissp := Self.CDS_1.FieldByName('issp').AsString; // fioType := Self.CDS_1.FieldByName('ioType').AsString; @@ -417,12 +506,40 @@ begin end; end; +procedure TfrmTatClothCKHZList.Tv3DblClick(Sender: TObject); +begin + if CDS_3.IsEmpty then + Exit; + try + frmTatClothCKHZList2 := TfrmTatClothCKHZList2.Create(Application); + with frmTatClothCKHZList2 do + begin + + fEndDateTime := self.EndDate.DateTime; + fBegDateTime := Self.BegDate.DateTime; + +// fDRMID := Self.CDS_1.FieldByName('DRMID').AsString; + fToCoID := Self.CDS_3.FieldByName('ToCoID').AsString; +// fC_Name := Self.CDS_1.FieldByName('C_Name').AsString; +// fissp := Self.CDS_1.FieldByName('issp').AsString; +// fioType := Self.CDS_1.FieldByName('ioType').AsString; + if ShowModal = 1 then + begin + + end; + end; + finally + frmTatClothCKHZList2.Free; + end; +end; procedure TfrmTatClothCKHZList.BTNPClick(Sender: TObject); begin if CurrentPage < CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber then CurrentPage := CurrentPage + 1; InitGrid(); + InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.BTLPClick(Sender: TObject); @@ -430,6 +547,8 @@ begin if CurrentPage > 1 then CurrentPage := CurrentPage - 1; InitGrid(); + InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.TCBNORChange(Sender: TObject); @@ -437,12 +556,16 @@ begin CurrentPage := 1; InitGrid(); + InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.JYTypeChange(Sender: TObject); begin CurrentPage := 1; InitGrid(); + InitGrid2(); + InitGrid3(); end; procedure TfrmTatClothCKHZList.MenuItem1Click(Sender: TObject); @@ -468,6 +591,28 @@ begin CopyColumnSummaryToClipboard2(TV2.Controller.FocusedColumn); end; +procedure TfrmTatClothCKHZList.MenuItem5Click(Sender: TObject); +begin + SelOKNo(CDS_3, true); + +end; + +procedure TfrmTatClothCKHZList.MenuItem6Click(Sender: TObject); +begin + SelOKNo(CDS_3, false); + +end; + +procedure TfrmTatClothCKHZList.MenuItem7Click(Sender: TObject); +begin + Clipboard.SetTextBuf(PChar(Trim(CDS_3.fieldbyname(TV3.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); +end; + +procedure TfrmTatClothCKHZList.MenuItem8Click(Sender: TObject); +begin + CopyColumnSummaryToClipboard3(TV3.Controller.FocusedColumn); +end; + procedure TfrmTatClothCKHZList.N1Click(Sender: TObject); begin SelOKNo(CDS_1, true); @@ -522,6 +667,25 @@ begin ShowMessage('δҵеĻ'); end; +procedure TfrmTatClothCKHZList.CopyColumnSummaryToClipboard3(AColumn: TcxGridColumn); +var + AView: TcxGridDBTableView; + SummaryIndex: Integer; + SummaryText: string; +begin + AView := Tv3; + + // ָеĻ + SummaryIndex := AView.DataController.Summary.FooterSummaryItems.IndexOfItemLink(AColumn); + if SummaryIndex <> -1 then + begin + SummaryText := AView.DataController.Summary.FooterSummaryTexts[SummaryIndex]; + Clipboard.AsText := SummaryText; + end + else + ShowMessage('δҵеĻ'); +end; + procedure TfrmTatClothCKHZList.ToolButton2Click(Sender: TObject); var WSql: string; @@ -576,6 +740,7 @@ procedure TfrmTatClothCKHZList.ToolButton4Click(Sender: TObject); begin WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, 'Ʒ'); + WriteCxGrid(trim(self.Caption) + 'Tv3', Tv3, 'Ʒ'); end; end. diff --git a/E04梭织坯布仓库/U_TatClothCKHZList2.pas b/E04梭织坯布仓库/U_TatClothCKHZList2.pas index 83c9772..fd98da7 100644 --- a/E04梭织坯布仓库/U_TatClothCKHZList2.pas +++ b/E04梭织坯布仓库/U_TatClothCKHZList2.pas @@ -90,6 +90,7 @@ type procedure InitGrid(); procedure SetStatus(); procedure CopyColumnSummaryToClipboard(AColumn: TcxGridColumn); + procedure InitGrid3(); { Private declarations } public fDRMID: string; @@ -97,7 +98,7 @@ type fC_Name: string; fioType: string; fToCoID: string; - fEndDateTime,fBegDateTime : TDateTime; + fEndDateTime, fBegDateTime: TDateTime; { Public declarations } end; @@ -114,7 +115,10 @@ uses procedure TfrmTatClothCKHZList2.SetStatus(); begin - + if fToCoID <> '' then + begin + Tv1DRMID.Visible := False; + end; end; procedure TfrmTatClothCKHZList2.FormClose(Sender: TObject; var Action: TCloseAction); @@ -166,7 +170,7 @@ begin sql.Add(' where A.IONo LIKE ''RSG%'' and A.IOFlag = '''' '); // sql.Add(' and (select COName from BS_Company X where X.CoAbbrName = max(B.ToCoName))= ' + QuotedStr(Trim(fconame))); sql.Add(' and A.C_Name = ' + QuotedStr(Trim(fC_Name))); - sql.Add(' and B.ToCoID = ' + QuotedStr(Trim(fToCoID))); +// sql.Add(' and B.ToCoID = ' + QuotedStr(Trim(fToCoID))); sql.Add(' and isnull(A.issp,'''') = ' + QuotedStr(Trim(fissp))); sql.Add(WSql); @@ -187,22 +191,98 @@ begin end; +procedure TfrmTatClothCKHZList2.InitGrid3(); +var + WSql: string; +begin + + WSql := SGetFilters(Panel1, 1, 2); + if Trim(WSql) <> '' then + WSql := ' and ' + WSql; + if IsJYTime.Checked then + begin + WSql := WSql + ' and A.IOTime>=' + quotedstr(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)); + WSql := WSql + ' and A.IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)); + end; + + try + ADOQueryMain.DisableControls; + + with ADOQueryMain do + begin + Filtered := False; + Close; + sql.Clear; + + sql.Add('SELECT A.C_CODE,A.C_Name,A.C_width,A.C_GramWeight'); + sql.Add(',CAST(ioTime AS DATE) as ioTime '); + sql.Add(', (SELECT COName FROM BS_Company X WHERE X.CoID = B.ToCoID) as COName'); + sql.Add(' ,COUNT(*) as js, SUM(A.meter) as Meter,SUM(A.NetWeight) as NetWeight '); + sql.Add(', CAST(A.C_Width AS DECIMAL(18,2))/100 * SUM(A.meter) as pf'); + SQL.Add(',ISNULL(A.issp, '''') as issp '); + sql.Add(' FROM V_Tat_Cloth_IO A '); + sql.Add(' left JOIN Tat_Cloth_DR_Main B on A.IONo = B.DRMID '); + sql.Add(' where A.IONo LIKE ''RSG%'' and A.IOFlag = '''' '); +// sql.Add(' and (select COName from BS_Company X where X.CoAbbrName = max(B.ToCoName))= ' + QuotedStr(Trim(fconame))); +// sql.Add(' and A.C_Name = ' + QuotedStr(Trim(fC_Name))); + sql.Add(' and B.ToCoID = ' + QuotedStr(Trim(fToCoID))); +// sql.Add(' and isnull(A.issp,'''') = ' + QuotedStr(Trim(fissp))); + sql.Add(WSql); + + SQL.Add(' group by A.C_CODE,A.C_width,A.C_GramWeight,A.C_Name,isnull(A.issp,''''),B.ToCoID,CAST(ioTime AS DATE)'); +// sql.Add(' HAVING(select COName from BS_Company X where X.CoAbbrName = max(B.ToCoName))= ' + QuotedStr(Trim(fconame))); + SQL.Add(' order by A.C_CODE,CAST(A.C_width AS INT),A.C_GramWeight,CAST(ioTime AS DATE)'); + +// showmessage(sql.text); + Open; + end; + SCreateCDS(ADOQueryMain, CDS_1); + SInitCDSData(ADOQueryMain, CDS_1); + + finally + ADOQueryMain.EnableControls; + TV1.DataController.Filter.Clear; + end; + +end; + procedure TfrmTatClothCKHZList2.IOTypeChange(Sender: TObject); begin - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.IsJYTimeClick(Sender: TObject); begin inherited; - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.TBRafreshClick(Sender: TObject); begin CurrentPage := 1; - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.CDS_1BeforeOpen(DataSet: TDataSet); @@ -223,7 +303,14 @@ procedure TfrmTatClothCKHZList2.cxPageControl1Change(Sender: TObject); begin CurrentPage := 1; SetStatus(); - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.C_NameKeyPress(Sender: TObject; var Key: Char); @@ -231,7 +318,14 @@ begin inherited; if Key = #13 then begin - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; end; @@ -244,8 +338,14 @@ end; procedure TfrmTatClothCKHZList2.FormShow(Sender: TObject); begin inherited; - - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ2'); + if fToCoID = '' then + begin + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ2޿ͻ'); + end + else + begin + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ2пͻ'); + end; CurrentPage := 1; RecordsNumber := 500; // canshu1 := Trim(Self.fParameters1); @@ -253,8 +353,14 @@ begin EndDate.DateTime := fEndDateTime; BegDate.DateTime := fBegDateTime; SetStatus(); - - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; @@ -269,7 +375,14 @@ begin Filtered := true; end; TcxGridToExcel(Self.Caption, cxGrid1); - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.orderNoKeyPress(Sender: TObject; var Key: Char); @@ -277,7 +390,14 @@ begin if Key = #13 then begin CurrentPage := 1; - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; end; @@ -301,27 +421,55 @@ procedure TfrmTatClothCKHZList2.BTNPClick(Sender: TObject); begin if CurrentPage < CDS_1.FieldByName('TotalCount').AsInteger / RecordsNumber then CurrentPage := CurrentPage + 1; - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.BTLPClick(Sender: TObject); begin if CurrentPage > 1 then CurrentPage := CurrentPage - 1; - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.TCBNORChange(Sender: TObject); begin CurrentPage := 1; - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.JYTypeChange(Sender: TObject); begin CurrentPage := 1; - InitGrid(); + if fToCoID = '' then + begin + InitGrid(); + end + else + begin + InitGrid3(); + end; end; procedure TfrmTatClothCKHZList2.N1Click(Sender: TObject); @@ -411,7 +559,15 @@ end; procedure TfrmTatClothCKHZList2.ToolButton4Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ2'); + if fToCoID = '' then + begin + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ2޿ͻ'); + end + else + begin + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ2пͻ'); + end; + end; end. diff --git a/E04梭织坯布仓库/U_TatClothCRStkHZList.dfm b/E04梭织坯布仓库/U_TatClothCRStkHZList.dfm index 2d0fa8c..8880cb2 100644 --- a/E04梭织坯布仓库/U_TatClothCRStkHZList.dfm +++ b/E04梭织坯布仓库/U_TatClothCRStkHZList.dfm @@ -33,7 +33,6 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList ParentFont = False ShowCaptions = True TabOrder = 0 - ExplicitLeft = -1 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -78,8 +77,6 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitLeft = 1 - ExplicitTop = 33 object Label2: TLabel Left = 70 Top = 36 @@ -211,6 +208,53 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList Time = 0.458268587972270300 TabOrder = 6 end + object cb_GradeYD: TCheckBox + Left = 216 + Top = 34 + Width = 60 + Height = 17 + Caption = #20248#31561#21697 + Checked = True + State = cbChecked + TabOrder = 7 + OnClick = cb_GradeYDClick + end + object cb_GradeED: TCheckBox + Left = 312 + Top = 34 + Width = 60 + Height = 17 + Caption = #20108#31561#21697 + TabOrder = 8 + OnClick = cb_GradeYDClick + end + object cb_GradeXJ: TCheckBox + Left = 408 + Top = 34 + Width = 60 + Height = 17 + Caption = #23567#21367 + TabOrder = 9 + OnClick = cb_GradeYDClick + end + object cb_GradeFQ: TCheckBox + Left = 511 + Top = 34 + Width = 60 + Height = 17 + Caption = #20998#20999 + TabOrder = 10 + OnClick = cb_GradeYDClick + end + object cb_GradeCS: TCheckBox + Left = 597 + Top = 34 + Width = 60 + Height = 17 + Caption = #27979#35797 + TabOrder = 11 + OnClick = cb_GradeYDClick + end end object Panel2: TPanel [2] Left = 0 @@ -234,8 +278,6 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList ParentFont = False PopupMenu = PM_1 TabOrder = 0 - ExplicitLeft = 2 - ExplicitTop = 6 object cxGrid1DBBandedTableView1: TcxGridDBBandedTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -340,6 +382,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'C_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 0 Position.ColIndex = 0 @@ -350,6 +393,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'BQOutPF' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 2 Position.ColIndex = 2 @@ -360,6 +404,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'OldStkmeter' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 3 Position.ColIndex = 1 @@ -370,6 +415,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'BQOutmeter' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 2 Position.ColIndex = 1 @@ -380,6 +426,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'OldStkPiece' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 3 Position.ColIndex = 0 @@ -390,6 +437,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'OldStkPF' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 3 Position.ColIndex = 2 @@ -400,6 +448,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'DayInPiece' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 4 Position.ColIndex = 0 @@ -410,6 +459,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'DayInmeter' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 4 Position.ColIndex = 1 @@ -420,6 +470,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'DayOutmeter' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 5 Position.ColIndex = 1 @@ -430,6 +481,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'DayOutPiece' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 5 Position.ColIndex = 0 @@ -440,6 +492,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'DayInPF' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 4 Position.ColIndex = 2 @@ -450,6 +503,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'BQOutPiece' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 2 Position.ColIndex = 0 @@ -460,6 +514,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'DayOutPF' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 5 Position.ColIndex = 2 @@ -470,6 +525,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'BQInPiece' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 1 Position.ColIndex = 0 @@ -480,6 +536,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'BQInPF' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 1 Position.ColIndex = 2 @@ -490,6 +547,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'BQInmeter' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 1 Position.ColIndex = 1 @@ -500,6 +558,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'C_Width' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 0 Position.ColIndex = 1 @@ -510,6 +569,7 @@ inherited frmTatClothCRStkHZList: TfrmTatClothCRStkHZList DataBinding.FieldName = 'Issp' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter + Options.Editing = False Width = 80 Position.BandIndex = 0 Position.ColIndex = 2 diff --git a/E04梭织坯布仓库/U_TatClothCRStkHZList.pas b/E04梭织坯布仓库/U_TatClothCRStkHZList.pas index 608cd56..4d8010f 100644 --- a/E04梭织坯布仓库/U_TatClothCRStkHZList.pas +++ b/E04梭织坯布仓库/U_TatClothCRStkHZList.pas @@ -69,6 +69,11 @@ type Tv1Column6: TcxGridDBBandedColumn; Tv1Column2: TcxGridDBBandedColumn; Tv1CIssp: TcxGridDBBandedColumn; + cb_GradeYD: TCheckBox; + cb_GradeED: TCheckBox; + cb_GradeXJ: TCheckBox; + cb_GradeFQ: TCheckBox; + cb_GradeCS: TCheckBox; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -96,6 +101,7 @@ type procedure N2Click(Sender: TObject); procedure Tv1DblClick(Sender: TObject); procedure N3Click(Sender: TObject); + procedure cb_GradeYDClick(Sender: TObject); private CurrentPage, RecordsNumber: Integer; lstCust: TStringList; @@ -140,6 +146,7 @@ end; procedure TfrmTatClothCRStkHZList.InitGrid(); var WSql: string; + wsql_Grade: string; begin WSql := SGetFilters(Panel1, 1, 2); @@ -151,6 +158,46 @@ begin // WSql := WSql + ' and IOTime<' + quotedstr(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)); // end; + if cb_GradeYD.Checked then + begin + if wsql_Grade = '' then + wsql_Grade := 'ŵƷ' + else + wsql_Grade := wsql_Grade + ',ŵƷ'; + end; + + if cb_GradeED.Checked then + begin + if wsql_Grade = '' then + wsql_Grade := 'Ʒ' + else + wsql_Grade := wsql_Grade + ',Ʒ'; + end; + + if cb_GradeXJ.Checked then + begin + if wsql_Grade = '' then + wsql_Grade := 'С' + else + wsql_Grade := wsql_Grade + ',С'; + end; + + if cb_GradeFQ.Checked then + begin + if wsql_Grade = '' then + wsql_Grade := '' + else + wsql_Grade := wsql_Grade + ','; + end; + + if cb_GradeCS.Checked then + begin + if wsql_Grade = '' then + wsql_Grade := '' + else + wsql_Grade := wsql_Grade + ','; + end; + try ADOQueryMain.DisableControls; @@ -161,12 +208,17 @@ begin sql.Clear; sql.Add(' exec P_Tat_Cloth_PSC '); - SQL.Add(' @Begdate='+QuotedStr(Trim(FormatDateTime('yyyy-mm-dd', BegDate.Date)))); - SQL.Add(' ,@Enddate='+QuotedStr(Trim(FormatDateTime('yyyy-mm-dd', EndDate.Date)))); - SQL.Add(' ,@dayDate='+QuotedStr(Trim(FormatDateTime('yyyy-mm-dd', dayDate.Date)))); - SQL.Add(' ,@WSql='+QuotedStr(Trim(WSql))); + SQL.Add(' @Begdate=' + QuotedStr(Trim(FormatDateTime('yyyy-mm-dd', BegDate.Date)))); + SQL.Add(' ,@Enddate=' + QuotedStr(Trim(FormatDateTime('yyyy-mm-dd', EndDate.Date)))); + SQL.Add(' ,@dayDate=' + QuotedStr(Trim(FormatDateTime('yyyy-mm-dd', dayDate.Date)))); + SQL.Add(' ,@WSql=' + QuotedStr(Trim(WSql))); + if wsql_Grade <> '' then + begin + // ֱӽõַΪֵ + sql.Add(',@wsql_Grade=' + QuotedStr(wsql_Grade)); + end; -// showmessage(sql.text); +// showmessage(sql.text); Open; end; SCreateCDS(ADOQueryMain, CDS_1); @@ -179,8 +231,6 @@ begin end; - - procedure TfrmTatClothCRStkHZList.IsJYTimeClick(Sender: TObject); begin inherited; @@ -199,6 +249,11 @@ begin lstCust.Clear; end; +procedure TfrmTatClothCRStkHZList.cb_GradeYDClick(Sender: TObject); +begin + InitGrid(); +end; + procedure TfrmTatClothCRStkHZList.ConNoMChange(Sender: TObject); begin if ADOQueryMain.Active then diff --git a/E04梭织坯布仓库/U_TatClothInList.dfm b/E04梭织坯布仓库/U_TatClothInList.dfm index b45c100..7f3f175 100644 --- a/E04梭织坯布仓库/U_TatClothInList.dfm +++ b/E04梭织坯布仓库/U_TatClothInList.dfm @@ -102,6 +102,7 @@ inherited frmTatClothInList: TfrmTatClothInList Color = clWhite ParentBackground = False TabOrder = 1 + ExplicitTop = 39 object Label2: TLabel Left = 70 Top = 36 @@ -277,6 +278,20 @@ inherited frmTatClothInList: TfrmTatClothInList Font.Style = [fsBold] ParentFont = False end + object Label9: TLabel + Left = 1184 + Top = 10 + Width = 26 + Height = 12 + Hint = '0' + Caption = #24211#23384 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object BegDate: TDateTimePicker Left = 88 Top = 6 @@ -457,6 +472,16 @@ inherited frmTatClothInList: TfrmTatClothInList TabOrder = 16 OnKeyPress = carnoKeyPress end + object StkExists: TEdit + Tag = 2 + Left = 1212 + Top = 6 + Width = 100 + Height = 20 + Hint = '0' + TabOrder = 17 + OnKeyPress = carnoKeyPress + end end object Panel6: TPanel [2] Left = 0 @@ -575,6 +600,7 @@ inherited frmTatClothInList: TfrmTatClothInList ParentFont = False PopupMenu = PM_1 TabOrder = 3 + ExplicitTop = 131 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -947,6 +973,13 @@ inherited frmTatClothInList: TfrmTatClothInList DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end + object Tv1StkExists: TcxGridDBColumn + Caption = #24211#23384 + DataBinding.FieldName = 'StkExists' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/E04梭织坯布仓库/U_TatClothInList.pas b/E04梭织坯布仓库/U_TatClothInList.pas index 241bd4e..dff664c 100644 --- a/E04梭织坯布仓库/U_TatClothInList.pas +++ b/E04梭织坯布仓库/U_TatClothInList.pas @@ -114,6 +114,9 @@ type Label6: TLabel; Grade: TEdit; N3: TMenuItem; + Tv1StkExists: TcxGridDBColumn; + Label9: TLabel; + StkExists: TEdit; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/E04梭织坯布仓库/U_TatClothRKHZList.dfm b/E04梭织坯布仓库/U_TatClothRKHZList.dfm index 8a5524a..67fc895 100644 --- a/E04梭织坯布仓库/U_TatClothRKHZList.dfm +++ b/E04梭织坯布仓库/U_TatClothRKHZList.dfm @@ -281,7 +281,6 @@ inherited frmTatClothRKHZList: TfrmTatClothRKHZList ParentFont = False PopupMenu = PM_1 TabOrder = 2 - ExplicitTop = 111 object Tv1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> diff --git a/E04梭织坯布仓库/U_TatClothRKHZList.pas b/E04梭织坯布仓库/U_TatClothRKHZList.pas index 39a69d5..f5ff48d 100644 --- a/E04梭织坯布仓库/U_TatClothRKHZList.pas +++ b/E04梭织坯布仓库/U_TatClothRKHZList.pas @@ -165,7 +165,7 @@ begin // sql.Add('select C_NAME, C_width,C_GramWeight,pcid,max(IOType) as IOType '); sql.Add('select C_NAME,C_GramWeight,IOType '); - SQL.Add(',pf=SUM(meter/100*CAST(C_WIDTH AS DECIMAL(18,2)))'); + SQL.Add(',pf=SUM(CASE WHEN (GRADE=''ŵƷ'' or GRADE=''Ʒ'' or GRADE=''С'' or GRADE='''' or GRADE='''') THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) else 0 end )'); SQL.Add(',SUM(CASE WHEN GRADE=''ŵƷ'' THEN 1 ELSE 0 END )AS YDJS'); SQL.Add(',SUM(CASE WHEN GRADE=''ŵƷ'' THEN meter ELSE 0 END )AS Ydqty'); SQL.Add(',SUM(CASE WHEN GRADE=''ŵƷ'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS YdPF'); @@ -178,22 +178,24 @@ begin SQL.Add(',SUM(CASE WHEN GRADE=''С'' THEN meter ELSE 0 END )AS xjqty'); SQL.Add(',SUM(CASE WHEN GRADE=''С'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS xjPF'); - SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN 1 ELSE 0 END )AS fbJS'); - SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter ELSE 0 END )AS fbqty'); - SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS fbPF'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN 1 ELSE 0 END )AS fbJS'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter ELSE 0 END )AS fbqty'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS fbPF'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN 1 ELSE 0 END )AS fqJS'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN meter ELSE 0 END )AS fqqty'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS fqPF'); - SQL.Add(',SUM(CASE WHEN GRADE=''ѭ'' THEN 1 ELSE 0 END )AS xhJS'); - SQL.Add(',SUM(CASE WHEN GRADE=''ѭ'' THEN meter ELSE 0 END )AS xhqty'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ѭ'' THEN 1 ELSE 0 END )AS xhJS'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ѭ'' THEN meter ELSE 0 END )AS xhqty'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN 1 ELSE 0 END )AS csJS'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN meter ELSE 0 END )AS csqty'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS csPF'); sql.Add(',issp=isnull(A.issp,'''') '); SQL.Add('from V_Tat_Cloth_IO A where (A.IOFlag = '''' ) ' + WSql); + SQL.Add(' and Grade <> ''ϲ'' '); + SQL.Add(' and Grade <> ''ѭ'' '); // sql.Add('group by C_NAME, C_width,C_GramWeight,pcid,isnull(A.issp,'''')'); sql.Add('group by C_NAME, IOType,C_GramWeight,isnull(A.issp,'''')'); @@ -325,6 +327,9 @@ begin with frmTatClothRKHZList2 do begin + fEndDateTime := self.EndDate.DateTime; + fBegDateTime := Self.BegDate.DateTime; + fC_Name := Self.CDS_1.FieldByName('C_Name').AsString; fissp := Self.CDS_1.FieldByName('issp').AsString; fioType := Self.CDS_1.FieldByName('ioType').AsString; diff --git a/E04梭织坯布仓库/U_TatClothRKHZList2.dfm b/E04梭织坯布仓库/U_TatClothRKHZList2.dfm index 3e2da22..222d0da 100644 --- a/E04梭织坯布仓库/U_TatClothRKHZList2.dfm +++ b/E04梭织坯布仓库/U_TatClothRKHZList2.dfm @@ -76,7 +76,6 @@ inherited frmTatClothRKHZList2: TfrmTatClothRKHZList2 Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 32 object Label2: TLabel Left = 70 Top = 36 @@ -281,7 +280,6 @@ inherited frmTatClothRKHZList2: TfrmTatClothRKHZList2 ParentFont = False PopupMenu = PM_1 TabOrder = 2 - ExplicitTop = 111 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/E04梭织坯布仓库/U_TatClothRKHZList2.pas b/E04梭织坯布仓库/U_TatClothRKHZList2.pas index 736e71b..53022c3 100644 --- a/E04梭织坯布仓库/U_TatClothRKHZList2.pas +++ b/E04梭织坯布仓库/U_TatClothRKHZList2.pas @@ -113,6 +113,7 @@ type fissp : string; fC_Name: string; fioType : string; + fEndDateTime,fBegDateTime : TDateTime; { Public declarations } end; @@ -171,7 +172,7 @@ begin // sql.Add('select C_NAME, C_width,C_GramWeight,pcid,max(IOType) as IOType '); sql.Add('select C_NAME,C_GramWeight,pcid,iotype,C_WIDTH '); - SQL.Add(',pf=SUM(meter/100*CAST(C_WIDTH AS DECIMAL(18,2)))'); + SQL.Add(',pf=SUM(CASE WHEN (GRADE=''ŵƷ'' or GRADE=''Ʒ'' or GRADE=''С'' or GRADE='''' or GRADE='''') THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) else 0 end )'); SQL.Add(',SUM(CASE WHEN GRADE=''ŵƷ'' THEN 1 ELSE 0 END )AS YDJS'); SQL.Add(',SUM(CASE WHEN GRADE=''ŵƷ'' THEN meter ELSE 0 END )AS Ydqty'); SQL.Add(',SUM(CASE WHEN GRADE=''ŵƷ'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS YdPF'); @@ -184,16 +185,16 @@ begin SQL.Add(',SUM(CASE WHEN GRADE=''С'' THEN meter ELSE 0 END )AS xjqty'); SQL.Add(',SUM(CASE WHEN GRADE=''С'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS xjPF'); - SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN 1 ELSE 0 END )AS fbJS'); - SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter ELSE 0 END )AS fbqty'); - SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS fbPF'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN 1 ELSE 0 END )AS fbJS'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter ELSE 0 END )AS fbqty'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS fbPF'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN 1 ELSE 0 END )AS fqJS'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN meter ELSE 0 END )AS fqqty'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS fqPF'); - SQL.Add(',SUM(CASE WHEN GRADE=''ѭ'' THEN 1 ELSE 0 END )AS xhJS'); - SQL.Add(',SUM(CASE WHEN GRADE=''ѭ'' THEN meter ELSE 0 END )AS xhqty'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ѭ'' THEN 1 ELSE 0 END )AS xhJS'); +// SQL.Add(',SUM(CASE WHEN GRADE=''ѭ'' THEN meter ELSE 0 END )AS xhqty'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN 1 ELSE 0 END )AS csJS'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN meter ELSE 0 END )AS csqty'); SQL.Add(',SUM(CASE WHEN GRADE='''' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS csPF'); @@ -202,6 +203,8 @@ begin SQL.Add('from V_Tat_Cloth_IO A where (A.IOFlag = '''' ) ' + WSql); sql.Add(' and C_NAME=' + QuotedStr(Trim(fC_Name))); sql.Add(' and ioType=' + QuotedStr(Trim(fioType))); + SQL.Add(' and Grade <> ''ϲ'' '); + SQL.Add(' and Grade <> ''ѭ'' '); if fissp <> '' then begin @@ -292,8 +295,8 @@ begin RecordsNumber := 500; // canshu1 := Trim(Self.fParameters1); - EndDate.DateTime := SGetServerDate(ADOQueryTemp); - BegDate.DateTime := EndDate.DateTime; + EndDate.DateTime := fEndDateTime; + BegDate.DateTime := fBegDateTime; SetStatus(); InitGrid(); diff --git a/E04梭织坯布仓库/U_TatClothStkHZList.dfm b/E04梭织坯布仓库/U_TatClothStkHZList.dfm index c2eac1d..ea7130b 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZList.dfm +++ b/E04梭织坯布仓库/U_TatClothStkHZList.dfm @@ -55,6 +55,7 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList AutoSize = True Caption = #20108#31561#27719#24635#26597#30475 ImageIndex = 8 + Visible = False end object ToolButton4: TToolButton Left = 261 @@ -202,7 +203,6 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList Height = 495 Align = alClient TabOrder = 2 - ExplicitTop = 111 object cxGrid1: TcxGrid Left = 1 Top = 1 diff --git a/E04梭织坯布仓库/U_TatClothStkHZList.pas b/E04梭织坯布仓库/U_TatClothStkHZList.pas index 22885f6..8c4d56e 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZList.pas +++ b/E04梭织坯布仓库/U_TatClothStkHZList.pas @@ -160,7 +160,8 @@ begin sql.Clear; sql.Add('select A.C_NAME ,A.C_GramWeight'); - SQL.Add(',pf=SUM(A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)))'); +// SQL.Add(',pf=SUM(A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)))'); + SQL.Add(',pf=SUM(CASE WHEN GRADE=''ŵƷ'' or GRADE=''Ʒ'' or GRADE=''С'' or GRADE='''' or GRADE='''' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) else 0 end )'); SQL.Add(',SUM(CASE WHEN A.GRADE=''ŵƷ'' THEN 1 ELSE 0 END )AS YDJS'); SQL.Add(',SUM(CASE WHEN A.GRADE=''ŵƷ'' THEN A.meter ELSE 0 END )AS Ydqty'); SQL.Add(',SUM(CASE WHEN A.GRADE=''ŵƷ'' THEN A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS YdPF'); @@ -170,20 +171,22 @@ begin SQL.Add(',SUM(CASE WHEN A.GRADE=''С'' THEN 1 ELSE 0 END )AS xjJS'); SQL.Add(',SUM(CASE WHEN A.GRADE=''С'' THEN A.meter ELSE 0 END )AS xjqty'); SQL.Add(',SUM(CASE WHEN A.GRADE=''С'' THEN A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS xjPF'); - SQL.Add(',SUM(CASE WHEN A.GRADE=''ϲ'' THEN 1 ELSE 0 END )AS fbJS'); - SQL.Add(',SUM(CASE WHEN A.GRADE=''ϲ'' THEN A.meter ELSE 0 END )AS fbqty'); +// SQL.Add(',SUM(CASE WHEN A.GRADE=''ϲ'' THEN 1 ELSE 0 END )AS fbJS'); +// SQL.Add(',SUM(CASE WHEN A.GRADE=''ϲ'' THEN A.meter ELSE 0 END )AS fbqty'); // SQL.Add(',SUM(CASE WHEN GRADE=''ϲ'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS fbPF'); SQL.Add(',SUM(CASE WHEN A.GRADE='''' THEN 1 ELSE 0 END )AS fqJS'); SQL.Add(',SUM(CASE WHEN A.GRADE='''' THEN A.meter ELSE 0 END )AS fqqty'); SQL.Add(',SUM(CASE WHEN A.GRADE='''' THEN A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS fqPF'); - SQL.Add(',SUM(CASE WHEN A.GRADE=''ѭ'' THEN 1 ELSE 0 END )AS xhJS'); - SQL.Add(',SUM(CASE WHEN A.GRADE=''ѭ'' THEN A.meter ELSE 0 END )AS xhqty'); +// SQL.Add(',SUM(CASE WHEN A.GRADE=''ѭ'' THEN 1 ELSE 0 END )AS xhJS'); +// SQL.Add(',SUM(CASE WHEN A.GRADE=''ѭ'' THEN A.meter ELSE 0 END )AS xhqty'); SQL.Add(',SUM(CASE WHEN A.GRADE='''' THEN 1 ELSE 0 END )AS csJS'); SQL.Add(',SUM(CASE WHEN A.GRADE='''' THEN A.meter ELSE 0 END )AS csqty'); SQL.Add(',SUM(CASE WHEN A.GRADE='''' THEN A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS csPF'); sql.Add(', issp=isnull(A.issp,'''') '); SQL.Add('from V_Tat_Cloth_stk A where 1=1 ' + WSql); + SQL.Add(' and Grade <> ''ϲ'' '); + SQL.Add(' and Grade <> ''ѭ'' '); sql.Add(' group by A.C_NAME,A.C_GramWeight,isnull(A.issp,'''') '); SQL.Add(' order by A.C_NAME,A.C_GramWeight,isnull(A.issp,'''') '); @@ -201,8 +204,6 @@ begin end; - - procedure TfrmTatClothStkHZList.IsJYTimeClick(Sender: TObject); begin inherited; @@ -308,6 +309,8 @@ begin frmTatClothStkHZList2 := TfrmTatClothStkHZList2.Create(Application); with frmTatClothStkHZList2 do begin + fEndDateTime := self.EndDate.DateTime; + fBegDateTime := Self.BegDate.DateTime; fC_Name := Self.CDS_1.FieldByName('C_Name').AsString; fissp := Self.CDS_1.FieldByName('issp').AsString; diff --git a/E04梭织坯布仓库/U_TatClothStkHZList2.pas b/E04梭织坯布仓库/U_TatClothStkHZList2.pas index 36b6a64..e67093f 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZList2.pas +++ b/E04梭织坯布仓库/U_TatClothStkHZList2.pas @@ -109,7 +109,8 @@ type { Private declarations } public fC_Name: string; - fissp : string; + fissp: string; + fEndDateTime, fBegDateTime: TDateTime; { Public declarations } end; @@ -139,8 +140,7 @@ procedure TfrmTatClothStkHZList2.FormCreate(Sender: TObject); begin inherited; lstCust := TStringList.Create; - EndDate.DateTime := SGetServerDateTime(ADOQueryTemp); - BegDate.DateTime := EndDate.DateTime - 20; + end; procedure TfrmTatClothStkHZList2.InitGrid(); @@ -167,7 +167,7 @@ begin sql.Clear; sql.Add('select A.C_NAME, A.C_width,A.C_GramWeight '); - SQL.Add(',pf=SUM(A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)))'); + SQL.Add(',pf=SUM(CASE WHEN (GRADE=''ŵƷ'' or GRADE=''Ʒ'' or GRADE=''С'' or GRADE='''' or GRADE='''') THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) else 0 end )'); SQL.Add(',SUM(CASE WHEN A.GRADE=''ŵƷ'' THEN 1 ELSE 0 END )AS YDJS'); SQL.Add(',SUM(CASE WHEN A.GRADE=''ŵƷ'' THEN A.meter ELSE 0 END )AS Ydqty'); SQL.Add(',SUM(CASE WHEN A.GRADE=''ŵƷ'' THEN A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS YdPF'); @@ -191,17 +191,17 @@ begin sql.Add(', issp=isnull(A.issp,'''') '); SQL.Add('from V_Tat_Cloth_stk A where 1=1 and C_NAME=' + QuotedStr(Trim(fC_Name))); + SQL.Add(' and Grade <> ''ϲ'' '); + SQL.Add(' and Grade <> ''ѭ'' '); if fissp <> '' then begin - SQL.Add(' and isnull(issp,'''') = ''˫''' ); + SQL.Add(' and isnull(issp,'''') = ''˫'''); end else begin - SQL.Add(' and isnull(issp,'''') <> ''˫'' ' ); + SQL.Add(' and isnull(issp,'''') <> ''˫'' '); end; - - SQL.Add(WSql); sql.Add(' group by A.C_NAME, A.C_width,A.C_GramWeight,isnull(A.issp,'''') '); SQL.Add(' order by A.C_NAME, CAST(A.C_Width AS DECIMAL(10,2)),A.C_GramWeight'); @@ -273,6 +273,8 @@ begin ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, 'Ʒ2'); CurrentPage := 1; RecordsNumber := 500; + EndDate.DateTime := fEndDateTime; + BegDate.DateTime := fBegDateTime; SetStatus(); InitGrid(); diff --git a/E04梭织坯布仓库/U_TatClothStkListPH.dfm b/E04梭织坯布仓库/U_TatClothStkListPH.dfm index ed29f40..b7281df 100644 --- a/E04梭织坯布仓库/U_TatClothStkListPH.dfm +++ b/E04梭织坯布仓库/U_TatClothStkListPH.dfm @@ -118,7 +118,6 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 41 object Label2: TLabel Left = 70 Top = 36 @@ -469,7 +468,6 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH AutoSize = True BorderStyle = bsSingle TabOrder = 2 - ExplicitTop = 99 DesignSize = ( 1536 23) diff --git a/E04梭织坯布仓库/U_TatDRList.dfm b/E04梭织坯布仓库/U_TatDRList.dfm index a4fe636..f68a1fe 100644 --- a/E04梭织坯布仓库/U_TatDRList.dfm +++ b/E04梭织坯布仓库/U_TatDRList.dfm @@ -229,7 +229,6 @@ inherited frmTatDRList: TfrmTatDRList Align = alClient PopupMenu = PM_1 TabOrder = 3 - ExplicitTop = 144 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -321,6 +320,13 @@ inherited frmTatDRList: TfrmTatDRList Styles.OnGetContentStyle = Tv1CheckEditStylesGetContentStyle Width = 80 end + object Tv1CheckEditTime: TcxGridDBColumn + Caption = #23457#26680#20462#25913#26102#38388 + DataBinding.FieldName = 'CheckEditTime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column8: TcxGridDBColumn Caption = #30003#35831#21333#21495 DataBinding.FieldName = 'DRMID' @@ -483,7 +489,6 @@ inherited frmTatDRList: TfrmTatDRList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 82 object Label4: TLabel Left = 520 Top = 15 diff --git a/E04梭织坯布仓库/U_TatDRList.pas b/E04梭织坯布仓库/U_TatDRList.pas index d008228..d772a70 100644 --- a/E04梭织坯布仓库/U_TatDRList.pas +++ b/E04梭织坯布仓库/U_TatDRList.pas @@ -122,6 +122,7 @@ type TV2PFPrice: TcxGridDBColumn; Tv1Saleser: TcxGridDBColumn; TbNowDay: TcxButton; + Tv1CheckEditTime: TcxGridDBColumn; //RMllPDFExport1: TRMllPDFExport; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); diff --git a/E04梭织坯布仓库/U_TatDRtInPut.pas b/E04梭织坯布仓库/U_TatDRtInPut.pas index 558fdb2..269ac53 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.pas +++ b/E04梭织坯布仓库/U_TatDRtInPut.pas @@ -422,6 +422,7 @@ begin if isCheck = 1 then ///޸ begin FieldByName('CheckEdit').Value := 'Ѹĵ'; + FieldByName('CheckEditTime').Value := SGetServerDateTime(ADOTemp); end; Post; end; diff --git a/E04梭织坯布仓库/testDll.identcache b/E04梭织坯布仓库/testDll.identcache index 9b95189..8c6564f 100644 Binary files a/E04梭织坯布仓库/testDll.identcache and b/E04梭织坯布仓库/testDll.identcache differ diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj.local b/F01染色坯布仓库/DyeGreyClothStk.dproj.local index 24b69d9..c49ac22 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dproj.local +++ b/F01染色坯布仓库/DyeGreyClothStk.dproj.local @@ -37,10 +37,10 @@ 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899/12/30 00:00:00.000.270,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899/12/30 00:00:00.000.734,=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.069,=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.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas