diff --git a/E03梭织坯布检验/TatInsp.dproj.local b/E03梭织坯布检验/TatInsp.dproj.local index 8bce76c..cd98722 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.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.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.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.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.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.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.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.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.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.292,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.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.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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj - 1899/12/30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.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.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.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.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.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.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.293,D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_KnitMachInsp.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_KnitMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\E02梭织坯布检验\U_TatMachInsp.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 diff --git a/E03梭织坯布检验/TatInsp.identcache b/E03梭织坯布检验/TatInsp.identcache index 264ed4f..3fced4d 100644 Binary files a/E03梭织坯布检验/TatInsp.identcache and b/E03梭织坯布检验/TatInsp.identcache differ diff --git a/E03梭织坯布检验/TatInspLogin.dproj.local b/E03梭织坯布检验/TatInspLogin.dproj.local index e379b49..6bcb841 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染色检验\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 + 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 diff --git a/E03梭织坯布检验/TatInspLogin.identcache b/E03梭织坯布检验/TatInspLogin.identcache index f9c4d47..83e3965 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 c558dce..7893966 100644 --- a/E03梭织坯布检验/U_TatClothInspHZList.dfm +++ b/E03梭织坯布检验/U_TatClothInspHZList.dfm @@ -254,6 +254,7 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList ParentFont = False PopupMenu = PM_1 TabOrder = 2 + ExplicitTop = 103 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -523,6 +524,15 @@ inherited frmTatClothInspHZList: TfrmTatClothInspHZList HeaderAlignmentHorz = taCenter Width = 90 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.CellMerging = True + Width = 80 + OnCompareRowValuesForCellMerging = Tv1isspCompareRowValuesForCellMerging + end object Tv1Column4: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' diff --git a/E03梭织坯布检验/U_TatClothInspHZList.pas b/E03梭织坯布检验/U_TatClothInspHZList.pas index a902592..29e933c 100644 --- a/E03梭织坯布检验/U_TatClothInspHZList.pas +++ b/E03梭织坯布检验/U_TatClothInspHZList.pas @@ -84,6 +84,7 @@ type Tv1cspf: TcxGridDBColumn; Tv1fqPF: TcxGridDBColumn; Tv1FBPF: TcxGridDBColumn; + Tv1issp: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -116,6 +117,7 @@ type procedure Tv1BCIOIDCompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean); procedure Tv1qgSLCompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean); procedure Tv1qgMeterCompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean); + procedure Tv1isspCompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean); private CurrentPage, RecordsNumber: Integer; lstCust: TStringList; @@ -177,7 +179,7 @@ begin Close; sql.Clear; sql.Add('select * from ( '); - sql.Add('select A.C_NAME, A.C_width,A.C_GramWeight,A.pcid,A.Carno,A.dxmeter '); + sql.Add('select A.C_NAME, A.C_width,A.C_GramWeight,A.pcid,A.Carno,A.dxmeter,A.issp '); sql.Add(' ,maX(B.C_Width) AS DXMF,A.CIMachNo,A.BCIOID '); // sql.Add(' ,CAST(isNull(A.dxmeter,''1'') AS DECIMAL(18,2)) '); @@ -215,7 +217,6 @@ begin SQL.Add(',SUM(CASE WHEN A.GRADE=''ϲ'' THEN A.meter ELSE 0 END )AS fbqty'); SQL.Add(',fbpf=SUM(CASE WHEN A.GRADE=''ϲ'' THEN A.meter ELSE 0 END )*A.C_Width/100 '); - 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(',fqpf=SUM(CASE WHEN A.GRADE='''' THEN A.meter ELSE 0 END )*A.C_Width/100 '); @@ -224,7 +225,7 @@ begin // 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(',cspf=SUM(CASE WHEN A.GRADE='''' THEN A.meter ELSE 0 END )*A.C_Width/100 '); + SQL.Add(',cspf=SUM(CASE WHEN A.GRADE='''' THEN A.meter ELSE 0 END )*A.C_Width/100 '); // ŵֶ - ŵȾ/(ŵȾ+С+Ⱦ+Ծ+о+ϲ(ųΪ0)) @@ -279,7 +280,7 @@ begin SQL.Add(WSql1); sql.Add(' group by A.C_NAME, A.C_width,A.C_GramWeight,A.pcid,A.Carno,A.dxmeter'); - sql.Add(' ,A.CIMachNo,A.BCIOID'); + sql.Add(' ,A.CIMachNo,A.BCIOID,A.issp'); sql.add(' ) T where 1=1 '); SQL.Add(WSql); @@ -385,6 +386,12 @@ end; procedure TfrmTatClothInspHZList.Tv1PCIDCompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean); begin +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; +// end; + if (ARow1.Values[Tv1PCID.Index] = ARow2.Values[Tv1PCID.Index]) and (ARow1.Values[Tv1PCID.Index] <> NULL) then AAreEqual := True else @@ -400,6 +407,11 @@ begin AAreEqual := False; exit; end; +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; +// end; if (ARow1.Values[Tv1qgMeter.Index] = ARow2.Values[Tv1qgMeter.Index]) and (ARow1.Values[Tv1qgMeter.Index] <> NULL) and (ARow2.Values[Tv1qgMeter.Index] <> NULL) then AAreEqual := True @@ -417,6 +429,11 @@ begin exit; end; +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; +// end; if (ARow1.Values[Tv1qgSL.Index] = ARow2.Values[Tv1qgSL.Index]) and (ARow1.Values[Tv1qgSL.Index] <> NULL) and (ARow2.Values[Tv1qgSL.Index] <> NULL) then AAreEqual := True else @@ -435,6 +452,11 @@ begin // begin // AAreEqual := False; // exit; +// end; +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; // end; if (ARow1.Values[Tv1DXMF.Index] = ARow2.Values[Tv1DXMF.Index]) and (ARow1.Values[Tv1DXMF.Index] <> NULL) and (ARow2.Values[Tv1DXMF.Index] <> NULL) then @@ -444,6 +466,21 @@ begin end; +procedure TfrmTatClothInspHZList.Tv1isspCompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean); +begin + if (ARow1.Values[Tv1PCID.Index] <> ARow2.Values[Tv1PCID.Index]) or (ARow1.Values[Tv1PCID.Index] = NULL) or (ARow2.Values[Tv1PCID.Index] = NULL) then + begin + AAreEqual := False; + exit; + end; + + if (ARow1.Values[Tv1issp.Index] = ARow2.Values[Tv1issp.Index]) and (ARow1.Values[Tv1issp.Index] <> NULL) and (ARow2.Values[Tv1issp.Index] <> NULL) then + AAreEqual := True + else + AAreEqual := False; + +end; + procedure TfrmTatClothInspHZList.Tv1BCIOIDCompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean); begin @@ -453,6 +490,12 @@ begin exit; end; +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; +// end; + if (ARow1.Values[Tv1BCIOID.Index] = ARow2.Values[Tv1BCIOID.Index]) and (ARow1.Values[Tv1BCIOID.Index] <> NULL) and (ARow2.Values[Tv1BCIOID.Index] <> NULL) then AAreEqual := True else @@ -470,6 +513,11 @@ begin // begin // AAreEqual := False; // exit; +// end; +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; // end; if (ARow1.Values[Tv1Carno.Index] = ARow2.Values[Tv1Carno.Index]) and (ARow1.Values[Tv1Carno.Index] <> NULL) and (ARow2.Values[Tv1Carno.Index] <> NULL) then @@ -487,6 +535,11 @@ begin AAreEqual := False; exit; end; +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; +// end; if (ARow1.Values[Tv1CIMachNo.Index] = ARow2.Values[Tv1CIMachNo.Index]) and (ARow1.Values[Tv1CIMachNo.Index] <> NULL) and (ARow2.Values[Tv1CIMachNo.Index] <> NULL) then AAreEqual := True @@ -504,6 +557,12 @@ begin exit; end; +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; +// end; + if (ARow1.Values[Tv1C_Name.Index] = ARow2.Values[Tv1C_Name.Index]) and (ARow1.Values[Tv1C_Name.Index] <> NULL) and (ARow2.Values[Tv1C_Name.Index] <> NULL) then AAreEqual := True else @@ -527,6 +586,11 @@ begin // begin // AAreEqual := False; // exit; +// end; +// if (ARow1.Values[Tv1issp.Index] <> ARow2.Values[Tv1issp.Index]) or (ARow1.Values[Tv1issp.Index] = NULL) or (ARow2.Values[Tv1issp.Index] = NULL) then +// begin +// AAreEqual := False; +// exit; // end; if (ARow1.Values[Tv1dxmeter.Index] = ARow2.Values[Tv1dxmeter.Index]) and (ARow1.Values[Tv1dxmeter.Index] <> NULL) and (ARow2.Values[Tv1dxmeter.Index] <> NULL) then diff --git a/E03梭织坯布检验/U_TatClothInspList.dfm b/E03梭织坯布检验/U_TatClothInspList.dfm index 5394260..a04abb9 100644 --- a/E03梭织坯布检验/U_TatClothInspList.dfm +++ b/E03梭织坯布检验/U_TatClothInspList.dfm @@ -7,7 +7,6 @@ inherited frmTatClothInspList: TfrmTatClothInspList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -616 ExplicitWidth = 1483 ExplicitHeight = 621 PixelsPerInch = 96 @@ -21,6 +20,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList AutoSize = True BorderStyle = bsSingle TabOrder = 1 + ExplicitTop = 101 DesignSize = ( 1463 24) @@ -649,6 +649,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList ' '#27491#24335#25968#25454' ' ' '#21024#38500#25968#25454' ') OnChange = cxTabControl1Change + ExplicitTop = 136 ClientRectBottom = 445 ClientRectLeft = 2 ClientRectRight = 1465 @@ -668,6 +669,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList ParentFont = False PopupMenu = PM_1 TabOrder = 0 + ExplicitLeft = 3 object Tv1: TcxGridDBTableView OnMouseUp = Tv1MouseUp Navigator.Buttons.CustomButtons = <> @@ -797,6 +799,13 @@ inherited frmTatClothInspList: TfrmTatClothInspList Options.Editing = False Width = 66 end + object Tv1ISSP: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'ISSP' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' diff --git a/E03梭织坯布检验/U_TatClothInspList.pas b/E03梭织坯布检验/U_TatClothInspList.pas index eb598c8..dc9c5f1 100644 --- a/E03梭织坯布检验/U_TatClothInspList.pas +++ b/E03梭织坯布检验/U_TatClothInspList.pas @@ -142,6 +142,7 @@ type dept: TEdit; Tv1C_MXSHWidth: TcxGridDBColumn; stkInsert: TToolButton; + Tv1ISSP: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -357,7 +358,7 @@ begin canshu1 := self.fParameters1; CurrentPage := 1; RecordsNumber := 500; - ReadCxGrid(Trim(self.Caption) + 'Tv1', Tv1, 'ó׼'); + ReadCxGrid(Trim(self.Caption) + 'Tv1', Tv1, 'Ϣ'); EndDate.DateTime := SGetServerDate(ADOQueryTemp); BegDate.DateTime := EndDate.DateTime; fsj := 'select distinct(Filler) name from Tat_Cloth_Inspect '; @@ -1072,7 +1073,7 @@ end; procedure TfrmTatClothInspList.ToolButton1Click(Sender: TObject); begin - WriteCxGrid(Trim(self.Caption) + 'Tv1', Tv1, 'ó׼'); + WriteCxGrid(Trim(self.Caption) + 'Tv1', Tv1, 'Ϣ'); end; procedure TfrmTatClothInspList.ToolButton2Click(Sender: TObject); diff --git a/E03梭织坯布检验/U_TatMachInsp.dfm b/E03梭织坯布检验/U_TatMachInsp.dfm index 5ddeff6..3a51c7a 100644 --- a/E03梭织坯布检验/U_TatMachInsp.dfm +++ b/E03梭织坯布检验/U_TatMachInsp.dfm @@ -3706,6 +3706,20 @@ Font.Style = [fsBold] ParentFont = False end + object Label79: TLabel + Left = 268 + Top = 157 + Width = 39 + Height = 14 + Caption = #21452#21943#65306 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -11 + Font.Name = 'Arial' + Font.Style = [fsBold] + ParentFont = False + Visible = False + end object Loom: TEdit Left = 659 Top = 208 @@ -4092,6 +4106,21 @@ TabOrder = 26 OnClick = CIFBegClick end + object issp: TEdit + Left = 313 + Top = 153 + Width = 36 + Height = 27 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -19 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 27 + Visible = False + OnClick = PackagingClick + end end end object ScrollBox1: TScrollBox [1] diff --git a/E03梭织坯布检验/U_TatMachInsp.pas b/E03梭织坯布检验/U_TatMachInsp.pas index e6c5abd..7ba486f 100644 --- a/E03梭织坯布检验/U_TatMachInsp.pas +++ b/E03梭织坯布检验/U_TatMachInsp.pas @@ -467,6 +467,8 @@ type Button12: TButton; Label78: TLabel; Edit1: TEdit; + Label79: TLabel; + issp: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -2912,7 +2914,7 @@ begin begin Close; SQL.Clear; - sql.Add('update Tat_Cloth_Inspect set c_width=(select c_width from bs_cloth_io e where e.bcioid=Tat_Cloth_Inspect.bcioid) '); + sql.Add('update Tat_Cloth_Inspect set c_width=(select c_width from bs_cloth_io e where e.bcioid=Tat_Cloth_Inspect.bcioid) '); sql.Add('where ciid =''' + Trim(maxno) + ''''); execsql; @@ -2925,9 +2927,10 @@ begin begin Close; SQL.Clear; - sql.Add('update Tat_Cloth_Inspect set tube= ' + QuotedStr(tube.Text)); + sql.Add('update Tat_Cloth_Inspect set tube= ' + QuotedStr(tube.Text)); sql.Add(',Packaging= ' + QuotedStr(Packaging.Text)); sql.Add(',Seal= ' + QuotedStr(Seal.Text)); + sql.Add(',issp= ' + QuotedStr(issp.Text)); sql.Add('where ciid =''' + Trim(maxno) + ''''); execsql; end; @@ -3904,6 +3907,7 @@ begin batchno.Text := ADOTmp.FieldByName('batchno').AsString; PCID.Text := ADOTmp.FieldByName('PCID').AsString; DXMETER.Text := ADOTmp.FieldByName('DXMETER').AsString; + issp.Text := ADOTmp.FieldByName('issp').AsString; if Application.MessageBox('Ƿг⣿', 'ʾ', 32 + 4) <> IDYES then begin edtScan.Text := ''; diff --git a/E03梭织坯布检验/testDll.identcache b/E03梭织坯布检验/testDll.identcache index 293c0c8..da92555 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 dd1c4bb..e5b9c53 100644 --- a/E04梭织坯布仓库/TatClothStk.dproj.local +++ b/E04梭织坯布仓库/TatClothStk.dproj.local @@ -1,71 +1,71 @@  + 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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899/12/30 00:00:00.000.782,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899/12/30 00:00:00.000.471,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899/12/30 00:00:00.000.471,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas - 1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.pas= - 1899/12/30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.dfm - 1899/12/30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.dfm - 1899/12/30 00:00:00.000.422,=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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas + 1899/12/30 00:00:00.000.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.pas 1899/12/30 00:00:00.000.506,=D:\Dp10Repo\项目代码\RTBasics\E00梭织通用窗体\U_TatPlanSel.pas 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899/12/30 00:00:00.000.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.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.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.720,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.dfm - 1899/12/30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.dfm - 1899/12/30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.pas + 1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.dfm + 1899/12/30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm + 1899/12/30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm + 1899/12/30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas 1899/12/30 00:00:00.000.999,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothStkList.pas - 1899/12/30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.pas - 1899/12/30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.pas + 1899/12/30 00:00:00.000.752,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitPlanSel.pas= 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas - 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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.471,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.dfm + 1899/12/30 00:00:00.000.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.dfm + 1899/12/30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.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.057,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRList.pas 1899/12/30 00:00:00.000.680,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899/12/30 00:00:00.000.752,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitPlanSel.pas= + 1899/12/30 00:00:00.000.875,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.pas= 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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.930,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothInList.pas + 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.094,D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\KnitClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\E03梭织坯布仓库\TatClothStk.dproj 1899/12/30 00:00:00.000.187,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.pas= - 1899/12/30 00:00:00.000.463,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkList.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm - 1899/12/30 00:00:00.000.720,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas + 1899/12/30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas 1899/12/30 00:00:00.000.439,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.471,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.pas + 1899/12/30 00:00:00.000.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.dfm=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.dfm 1899/12/30 00:00:00.000.442,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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_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.189,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothOutEdit.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.231,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas - 1899/12/30 00:00:00.000.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.038,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\Unit1.pas= + 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899/12/30 00:00:00.000.720,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm + 1899/12/30 00:00:00.000.378,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas= + 1899/12/30 00:00:00.000.720,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899/12/30 00:00:00.000.132,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.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.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj - 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.393,D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZList.pas=D:\Dp10Repo\项目代码\恒燕\E04梭织坯布仓库\U_TatClothStkHZListSEL.pas - 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899/12/30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.pas + 1899/12/30 00:00:00.000.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm 1899/12/30 00:00:00.000.231,=D:\Dp10Repo\项目代码\恒燕\A00通用窗体\U_TatClothInfoSel.pas - 1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.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.411,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.pas= - 1899/12/30 00:00:00.000.378,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas= - 1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.dfm - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj 1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899/12/30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.pas + 1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothDROutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothDROutEdit.pas diff --git a/E04梭织坯布仓库/U_TatClothCKHZList.dfm b/E04梭织坯布仓库/U_TatClothCKHZList.dfm index 0177dcb..93770d7 100644 --- a/E04梭织坯布仓库/U_TatClothCKHZList.dfm +++ b/E04梭织坯布仓库/U_TatClothCKHZList.dfm @@ -77,7 +77,6 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 44 object Label2: TLabel Left = 70 Top = 36 @@ -277,7 +276,6 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList Font.Style = [] ParentFont = False TabOrder = 2 - ExplicitTop = 111 object TabSheet1: TTabSheet Caption = #26377#20986#24211#21333#20986#24211 object cxGrid1: TcxGrid @@ -295,7 +293,6 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList ParentFont = False PopupMenu = PM_1 TabOrder = 0 - ExplicitHeight = 467 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -403,6 +400,13 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList Options.Editing = False Width = 66 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1C_Width: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' @@ -471,7 +475,6 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList ParentFont = False PopupMenu = PM_1 TabOrder = 0 - ExplicitHeight = 467 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -572,6 +575,13 @@ inherited frmTatClothCKHZList: TfrmTatClothCKHZList Options.Editing = False Width = 66 end + object Tv2issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object cxGridDBColumn6: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' diff --git a/E04梭织坯布仓库/U_TatClothCKHZList.pas b/E04梭织坯布仓库/U_TatClothCKHZList.pas index 674d530..ed0b178 100644 --- a/E04梭织坯布仓库/U_TatClothCKHZList.pas +++ b/E04梭织坯布仓库/U_TatClothCKHZList.pas @@ -81,6 +81,8 @@ type DS_2: TDataSource; GPM_2: TcxGridPopupMenu; Tv1ToCoName: TcxGridDBColumn; + Tv1issp: TcxGridDBColumn; + Tv2issp: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -171,16 +173,13 @@ begin sql.Add(',ToCoName=max(B.ToCoName),ioTime=min(ioTime) '); 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(',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); - SQL.Add(' group by A.C_CODE ,A.C_Width,A.C_GramWeight,A.IONO,A.C_Name'); - SQL.Add(' order by A.IONO'); - - - - + SQL.Add(' group by A.C_CODE ,A.C_Width,A.C_GramWeight,A.IONO,A.C_Name,A.issp'); + SQL.Add(' order by A.IONO,A.C_CODE ,A.C_Width,A.C_GramWeight'); // showmessage(sql.text); Open; @@ -222,11 +221,13 @@ begin sql.Add(',ioTime=min(ioTime),ioType=max(A.ioType) '); 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 = max(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 not LIKE ''RSG%'' and A.IOFlag = '''' '); sql.Add(WSql); - SQL.Add(' group by A.C_CODE ,A.C_Width,A.C_GramWeight,A.C_Name'); + SQL.Add(' group by A.C_CODE ,A.C_Width,A.C_GramWeight,A.C_Name,A.issp'); + SQL.Add(' order By A.C_CODE ,A.C_Width,A.C_GramWeight'); // SQL.Add(' order by B.DRMID'); @@ -302,7 +303,8 @@ procedure TfrmTatClothCKHZList.FormShow(Sender: TObject); begin inherited; - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); + ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, 'Ʒ'); CurrentPage := 1; RecordsNumber := 500; canshu1 := Trim(Self.fParameters1); @@ -430,7 +432,8 @@ end; procedure TfrmTatClothCKHZList.ToolButton4Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); + WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, 'Ʒ'); end; end. diff --git a/E04梭织坯布仓库/U_TatClothInList.dfm b/E04梭织坯布仓库/U_TatClothInList.dfm index 3b2a6ef..ae65ae1 100644 --- a/E04梭织坯布仓库/U_TatClothInList.dfm +++ b/E04梭织坯布仓库/U_TatClothInList.dfm @@ -102,7 +102,6 @@ inherited frmTatClothInList: TfrmTatClothInList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = 39 object Label2: TLabel Left = 70 Top = 36 @@ -552,7 +551,6 @@ inherited frmTatClothInList: TfrmTatClothInList ParentFont = False PopupMenu = PM_1 TabOrder = 3 - ExplicitTop = 131 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -687,6 +685,13 @@ inherited frmTatClothInList: TfrmTatClothInList Options.Editing = False Width = 66 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' diff --git a/E04梭织坯布仓库/U_TatClothInList.pas b/E04梭织坯布仓库/U_TatClothInList.pas index 5ecf600..67f1d41 100644 --- a/E04梭织坯布仓库/U_TatClothInList.pas +++ b/E04梭织坯布仓库/U_TatClothInList.pas @@ -109,6 +109,7 @@ type dept: TEdit; IOType: TComboBox; Label8: TLabel; + Tv1issp: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -263,7 +264,7 @@ begin canshu1 := self.fParameters1; canshu2 := self.fParameters3; FWorkshop := self.fParameters3; - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); CurrentPage := 1; RecordsNumber := 500; @@ -521,7 +522,7 @@ end; procedure TfrmTatClothInList.ToolButton4Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); end; end. diff --git a/E04梭织坯布仓库/U_TatClothOutList.dfm b/E04梭织坯布仓库/U_TatClothOutList.dfm index 3b52468..01b867a 100644 --- a/E04梭织坯布仓库/U_TatClothOutList.dfm +++ b/E04梭织坯布仓库/U_TatClothOutList.dfm @@ -660,6 +660,13 @@ inherited frmTatClothOutList: TfrmTatClothOutList Options.Editing = False Width = 66 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' @@ -867,13 +874,13 @@ inherited frmTatClothOutList: TfrmTatClothOutList end inherited ADOQueryBaseCmd: TADOQuery Connection = DataLink_TatClothStk.ADOLink - Left = 553 - Top = 200 + Left = 569 + Top = 152 end inherited ADOQueryBaseTemp: TADOQuery Connection = DataLink_TatClothStk.ADOLink - Left = 425 - Top = 201 + Left = 417 + Top = 153 end object ADOQueryCmd: TADOQuery Connection = DataLink_TatClothStk.ADOLink @@ -917,7 +924,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList end object PM_1: TPopupMenu Left = 560 - Top = 384 + Top = 288 object N1: TMenuItem Caption = #20840#36873 OnClick = N1Click diff --git a/E04梭织坯布仓库/U_TatClothOutList.pas b/E04梭织坯布仓库/U_TatClothOutList.pas index ffb599d..b94a816 100644 --- a/E04梭织坯布仓库/U_TatClothOutList.pas +++ b/E04梭织坯布仓库/U_TatClothOutList.pas @@ -104,6 +104,7 @@ type Tv1Column1: TcxGridDBColumn; Label6: TLabel; dept: TEdit; + Tv1issp: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -250,7 +251,7 @@ procedure TfrmTatClothOutList.FormShow(Sender: TObject); begin inherited; - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒб'); CurrentPage := 1; RecordsNumber := 500; canshu1 := self.fParameters1; @@ -532,7 +533,7 @@ end; procedure TfrmTatClothOutList.ToolButton4Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒб'); end; end. diff --git a/E04梭织坯布仓库/U_TatClothRKHZList.dfm b/E04梭织坯布仓库/U_TatClothRKHZList.dfm index 4d1643e..896b5aa 100644 --- a/E04梭织坯布仓库/U_TatClothRKHZList.dfm +++ b/E04梭织坯布仓库/U_TatClothRKHZList.dfm @@ -409,6 +409,13 @@ inherited frmTatClothRKHZList: TfrmTatClothRKHZList Options.Editing = False Width = 66 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1IOType: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' @@ -451,6 +458,13 @@ inherited frmTatClothRKHZList: TfrmTatClothRKHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1YdPF: TcxGridDBColumn + Caption = #20248#31561#24179#26041 + DataBinding.FieldName = 'YdPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column7: TcxGridDBColumn Caption = #20108#31561#21367#25968 DataBinding.FieldName = 'edJS' @@ -465,6 +479,13 @@ inherited frmTatClothRKHZList: TfrmTatClothRKHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1edPF: TcxGridDBColumn + Caption = #20108#31561#24179#26041 + DataBinding.FieldName = 'edPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column9: TcxGridDBColumn Caption = #23567#21367#21367#25968 DataBinding.FieldName = 'xjJS' @@ -479,6 +500,13 @@ inherited frmTatClothRKHZList: TfrmTatClothRKHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1xjPF: TcxGridDBColumn + Caption = #23567#21367#24179#26041 + DataBinding.FieldName = 'xjPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column13: TcxGridDBColumn Caption = #20998#20999#21367#25968 DataBinding.FieldName = 'fqJS' @@ -493,6 +521,13 @@ inherited frmTatClothRKHZList: TfrmTatClothRKHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1fqPF: TcxGridDBColumn + Caption = #20998#20999#24179#26041 + DataBinding.FieldName = 'fqPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column17: TcxGridDBColumn Caption = #27979#35797#21367#25968 DataBinding.FieldName = 'csJS' @@ -507,6 +542,13 @@ inherited frmTatClothRKHZList: TfrmTatClothRKHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1csPF: TcxGridDBColumn + Caption = #27979#35797#24179#26041 + DataBinding.FieldName = 'csPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column19: TcxGridDBColumn Caption = #24179#26041 DataBinding.FieldName = 'pf' diff --git a/E04梭织坯布仓库/U_TatClothRKHZList.pas b/E04梭织坯布仓库/U_TatClothRKHZList.pas index 3d5c389..5ad4fe3 100644 --- a/E04梭织坯布仓库/U_TatClothRKHZList.pas +++ b/E04梭织坯布仓库/U_TatClothRKHZList.pas @@ -68,6 +68,12 @@ type Label4: TLabel; Label6: TLabel; PCID: TEdit; + Tv1issp: TcxGridDBColumn; + Tv1YdPF: TcxGridDBColumn; + Tv1edPF: TcxGridDBColumn; + Tv1xjPF: TcxGridDBColumn; + Tv1fqPF: TcxGridDBColumn; + Tv1csPF: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -157,23 +163,35 @@ begin SQL.Add(',pf=SUM(meter/100*CAST(C_WIDTH AS DECIMAL(18,2)))'); 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'); + SQL.Add(',SUM(CASE WHEN GRADE=''Ʒ'' THEN 1 ELSE 0 END )AS edJS'); SQL.Add(',SUM(CASE WHEN GRADE=''Ʒ'' THEN meter ELSE 0 END )AS edqty'); + SQL.Add(',SUM(CASE WHEN GRADE=''Ʒ'' THEN meter/100*CAST(C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS edPF'); + SQL.Add(',SUM(CASE WHEN GRADE=''С'' THEN 1 ELSE 0 END )AS xjJS'); 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 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 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(',max(issp) as issp '); SQL.Add('from V_Tat_Cloth_IO A where (A.IOFlag = '''' ) ' + WSql); - sql.Add('group by C_NAME, C_width,C_GramWeight,pcid'); - + sql.Add('group by C_NAME, C_width,C_GramWeight,pcid,issp'); + sql.Add('Order by C_NAME, C_width,C_GramWeight '); // showmessage(sql.text); Open; end; @@ -245,7 +263,7 @@ procedure TfrmTatClothRKHZList.FormShow(Sender: TObject); begin inherited; - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); CurrentPage := 1; RecordsNumber := 500; canshu1 := Trim(Self.fParameters1); @@ -375,7 +393,7 @@ end; procedure TfrmTatClothRKHZList.ToolButton4Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); end; end. diff --git a/E04梭织坯布仓库/U_TatClothStkHZList.dfm b/E04梭织坯布仓库/U_TatClothStkHZList.dfm index 7b6c477..bd3e3e8 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZList.dfm +++ b/E04梭织坯布仓库/U_TatClothStkHZList.dfm @@ -33,6 +33,7 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList ParentFont = False ShowCaptions = True TabOrder = 0 + ExplicitTop = 2 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -77,6 +78,7 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList Color = clWhite ParentBackground = False TabOrder = 1 + ExplicitTop = 32 object Label2: TLabel Left = 70 Top = 36 @@ -368,6 +370,13 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList Options.Editing = False Width = 66 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column2: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_width' @@ -396,6 +405,13 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1Column5: TcxGridDBColumn + Caption = #20248#31561#24179#26041 + DataBinding.FieldName = 'YdPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column7: TcxGridDBColumn Caption = #20108#31561#21367#25968 DataBinding.FieldName = 'edJS' @@ -410,6 +426,13 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1Column11: TcxGridDBColumn + Caption = #20108#31561#24179#26041 + DataBinding.FieldName = 'edPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column9: TcxGridDBColumn Caption = #23567#21367#21367#25968 DataBinding.FieldName = 'xjJS' @@ -424,6 +447,13 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1Column12: TcxGridDBColumn + Caption = #23567#21367#24179#26041 + DataBinding.FieldName = 'xjPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column13: TcxGridDBColumn Caption = #20998#20999#21367#25968 DataBinding.FieldName = 'fqJS' @@ -438,6 +468,13 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1Column15: TcxGridDBColumn + Caption = #20998#20999#24179#26041 + DataBinding.FieldName = 'fqPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column17: TcxGridDBColumn Caption = #27979#35797#21367#25968 DataBinding.FieldName = 'csJS' @@ -452,6 +489,13 @@ inherited frmTatClothStkHZList: TfrmTatClothStkHZList HeaderAlignmentHorz = taCenter Width = 80 end + object Tv1Column16: TcxGridDBColumn + Caption = #27979#35797#24179#26041 + DataBinding.FieldName = 'csPF' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column19: TcxGridDBColumn Caption = #24179#26041 DataBinding.FieldName = 'pf' diff --git a/E04梭织坯布仓库/U_TatClothStkHZList.pas b/E04梭织坯布仓库/U_TatClothStkHZList.pas index 88517c3..998d57f 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZList.pas +++ b/E04梭织坯布仓库/U_TatClothStkHZList.pas @@ -62,6 +62,12 @@ type label12: TLabel; C_width: TEdit; label11: TLabel; + Tv1Column5: TcxGridDBColumn; + Tv1Column11: TcxGridDBColumn; + Tv1Column12: TcxGridDBColumn; + Tv1Column15: TcxGridDBColumn; + Tv1Column16: TcxGridDBColumn; + Tv1issp: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -146,26 +152,34 @@ begin Close; sql.Clear; - sql.Add('select C_NAME, C_width,C_GramWeight '); - SQL.Add(',pf=SUM(meter/100*CAST(C_WIDTH AS DECIMAL(18,2)))'); - 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 1 ELSE 0 END )AS edJS'); - SQL.Add(',SUM(CASE WHEN GRADE=''Ʒ'' THEN meter ELSE 0 END )AS edqty'); - SQL.Add(',SUM(CASE WHEN GRADE=''С'' THEN 1 ELSE 0 END )AS xjJS'); - SQL.Add(',SUM(CASE WHEN GRADE=''С'' THEN meter ELSE 0 END )AS xjqty'); - 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 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 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('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(',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'); + SQL.Add(',SUM(CASE WHEN A.GRADE=''Ʒ'' THEN 1 ELSE 0 END )AS edJS'); + SQL.Add(',SUM(CASE WHEN A.GRADE=''Ʒ'' THEN A.meter ELSE 0 END )AS edqty'); + SQL.Add(',SUM(CASE WHEN A.GRADE=''Ʒ'' THEN A.meter/100*CAST(A.C_WIDTH AS DECIMAL(18,2)) ELSE 0 END )AS edPF'); + 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 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 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(', A.issp '); - SQL.Add('from V_Tat_Cloth_stk A where 1=1 ' + WSql); + SQL.Add('from V_Tat_Cloth_stk A where 1=1 ' + WSql); - sql.Add(' group by C_NAME, C_width,C_GramWeight'); + sql.Add(' group by A.C_NAME, A.C_width,A.C_GramWeight,issp'); + SQL.Add(' order by A.C_NAME, A.C_width,A.C_GramWeight'); // showmessage(sql.text); Open; @@ -232,7 +246,7 @@ procedure TfrmTatClothStkHZList.FormShow(Sender: TObject); begin inherited; - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); CurrentPage := 1; RecordsNumber := 500; canshu1 := Trim(Self.fParameters1); @@ -358,7 +372,7 @@ end; procedure TfrmTatClothStkHZList.ToolButton4Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒ'); end; end. diff --git a/E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm b/E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm index 9d6229c..ca53ed3 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm +++ b/E04梭织坯布仓库/U_TatClothStkHZListSEL.dfm @@ -280,6 +280,13 @@ inherited frmTatClothStkHZListSEL: TfrmTatClothStkHZListSEL HeaderAlignmentHorz = taCenter Width = 69 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1Column4: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_width' diff --git a/E04梭织坯布仓库/U_TatClothStkHZListSEL.pas b/E04梭织坯布仓库/U_TatClothStkHZListSEL.pas index c913c79..4070339 100644 --- a/E04梭织坯布仓库/U_TatClothStkHZListSEL.pas +++ b/E04梭织坯布仓库/U_TatClothStkHZListSEL.pas @@ -54,6 +54,7 @@ type Tv1Column4: TcxGridDBColumn; Tv1Column5: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; + Tv1issp: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -141,8 +142,8 @@ begin Close; sql.Clear; - sql.Add('select C_GramWeight,c_color,C_width,C_CODE,C_NAME,COUNT(*)JS,SUM(stkMeter)stkMeter,SUM(StkYardage)StkYardage from V_Tat_Cloth_Stk AA where 1=1 ' + WSql); - sql.Add('group by C_GramWeight,c_color,C_width,C_CODE,C_NAME'); + sql.Add('select C_GramWeight,c_color,C_width,C_CODE,C_NAME,issp,COUNT(*)JS,SUM(stkMeter)stkMeter,SUM(StkYardage)StkYardage from V_Tat_Cloth_Stk AA where 1=1 ' + WSql); + sql.Add('group by C_GramWeight,c_color,C_width,C_CODE,C_NAME,issp'); // showmessage(sql.text); Open; diff --git a/E04梭织坯布仓库/U_TatClothStkList.dfm b/E04梭织坯布仓库/U_TatClothStkList.dfm index bb43f3e..67d1c9d 100644 --- a/E04梭织坯布仓库/U_TatClothStkList.dfm +++ b/E04梭织坯布仓库/U_TatClothStkList.dfm @@ -610,6 +610,13 @@ inherited frmTatClothStkList: TfrmTatClothStkList Options.Editing = False Width = 66 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' diff --git a/E04梭织坯布仓库/U_TatClothStkList.pas b/E04梭织坯布仓库/U_TatClothStkList.pas index 73a5b75..d26ef9e 100644 --- a/E04梭织坯布仓库/U_TatClothStkList.pas +++ b/E04梭织坯布仓库/U_TatClothStkList.pas @@ -95,6 +95,7 @@ type Tv1FlawList: TcxGridDBColumn; Label1: TLabel; dept: TEdit; + Tv1issp: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -181,7 +182,7 @@ begin sql.Add(' from '); sql.Add('(select rownumber=cast((row_number() over(order by AA.IOTime desc)) as int)'); sql.Add(',COUNT(1) OVER() AS TotalCount'); - sql.Add(',* from V_Tat_Cloth_Stk AA where 1=1 ' + WSql); + sql.Add(',AA.* from V_Tat_Cloth_Stk AA where 1=1 ' + WSql); if canshu2 = '' then begin sql.Add(' and IsStocking=1'); @@ -239,7 +240,7 @@ procedure TfrmTatClothStkList.FormShow(Sender: TObject); begin inherited; - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒб'); CurrentPage := 1; RecordsNumber := 500; canshu1 := Trim(Self.fParameters1); @@ -386,7 +387,7 @@ end; procedure TfrmTatClothStkList.ToolButton4Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒб'); end; end. diff --git a/E04梭织坯布仓库/U_TatClothStkListPH.dfm b/E04梭织坯布仓库/U_TatClothStkListPH.dfm index 8d684c4..ec19a01 100644 --- a/E04梭织坯布仓库/U_TatClothStkListPH.dfm +++ b/E04梭织坯布仓库/U_TatClothStkListPH.dfm @@ -57,16 +57,8 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH ImageIndex = 20 OnClick = TBExportClick end - object ToolButton4: TToolButton - Left = 237 - Top = 0 - AutoSize = True - Caption = #20445#23384#26684#24335 - ImageIndex = 16 - OnClick = ToolButton4Click - end object ToolButton1: TToolButton - Left = 332 + Left = 237 Top = 0 AutoSize = True Caption = #25764#38144#37197#36135 @@ -74,7 +66,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH OnClick = ToolButton1Click end object ToolButton3: TToolButton - Left = 427 + Left = 332 Top = 0 AutoSize = True Caption = #21457#36135 @@ -82,7 +74,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH OnClick = ToolButton3Click end object ToolButton5: TToolButton - Left = 498 + Left = 403 Top = 0 AutoSize = True Caption = #36192#36865 @@ -90,13 +82,21 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH OnClick = ToolButton5Click end object ToolButton6: TToolButton - Left = 569 + Left = 474 Top = 0 AutoSize = True Caption = #25764#38144#36192#36865 ImageIndex = 18 OnClick = ToolButton6Click end + object ToolButton4: TToolButton + Left = 569 + Top = 0 + AutoSize = True + Caption = #20445#23384#26684#24335 + ImageIndex = 16 + OnClick = ToolButton4Click + end object TBClose: TToolButton Left = 664 Top = 0 @@ -575,6 +575,7 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH ParentFont = False PopupMenu = PM_1 TabOrder = 3 + ExplicitTop = 133 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -711,6 +712,13 @@ inherited frmTatClothStkListPH: TfrmTatClothStkListPH Options.Editing = False Width = 66 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' diff --git a/E04梭织坯布仓库/U_TatClothStkListPH.pas b/E04梭织坯布仓库/U_TatClothStkListPH.pas index 48097e2..d4b1373 100644 --- a/E04梭织坯布仓库/U_TatClothStkListPH.pas +++ b/E04梭织坯布仓库/U_TatClothStkListPH.pas @@ -111,6 +111,7 @@ type Tv1Column15: TcxGridDBColumn; Tv1Column16: TcxGridDBColumn; Tv1GiftReason: TcxGridDBColumn; + Tv1issp: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -267,7 +268,7 @@ procedure TfrmTatClothStkListPH.FormShow(Sender: TObject); begin inherited; - ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + ReadCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒб'); CurrentPage := 1; RecordsNumber := 500; canshu1 := Trim(Self.fParameters1); @@ -572,7 +573,7 @@ end; procedure TfrmTatClothStkListPH.ToolButton4Click(Sender: TObject); begin - WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒֿ'); + WriteCxGrid(trim(self.Caption) + 'Tv1', Tv1, 'Ʒб'); end; procedure TfrmTatClothStkListPH.ToolButton5Click(Sender: TObject); diff --git a/E04梭织坯布仓库/U_TatDRList.dfm b/E04梭织坯布仓库/U_TatDRList.dfm index 9e1d15a..9a06b1e 100644 --- a/E04梭织坯布仓库/U_TatDRList.dfm +++ b/E04梭织坯布仓库/U_TatDRList.dfm @@ -205,7 +205,6 @@ inherited frmTatDRList: TfrmTatDRList Align = alClient PopupMenu = PM_1 TabOrder = 3 - ExplicitTop = 144 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -638,7 +637,6 @@ inherited frmTatDRList: TfrmTatDRList #24050#21462#28040 #20840#37096) OnChange = cxTabControl1Change - ExplicitTop = 127 ClientRectRight = 0 ClientRectTop = 0 end @@ -658,6 +656,7 @@ inherited frmTatDRList: TfrmTatDRList Height = 222 Align = alBottom TabOrder = 5 + ExplicitTop = 370 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -708,6 +707,13 @@ inherited frmTatDRList: TfrmTatDRList Options.Editing = False Width = 71 end + object TV2issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end object cxGridDBColumn4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' diff --git a/E04梭织坯布仓库/U_TatDRList.pas b/E04梭织坯布仓库/U_TatDRList.pas index 440d97d..a1d4f76 100644 --- a/E04梭织坯布仓库/U_TatDRList.pas +++ b/E04梭织坯布仓库/U_TatDRList.pas @@ -111,6 +111,7 @@ type PM11: TMenuItem; Tv1Telephone: TcxGridDBColumn; cxGridPopupMenu2: TcxGridPopupMenu; + TV2issp: TcxGridDBColumn; //RMllPDFExport1: TRMllPDFExport; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); diff --git a/E04梭织坯布仓库/U_TatDRtInPut.dfm b/E04梭织坯布仓库/U_TatDRtInPut.dfm index 423a8e5..a8b41ba 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.dfm +++ b/E04梭织坯布仓库/U_TatDRtInPut.dfm @@ -444,6 +444,17 @@ object frmTatDRtInPut: TfrmTatDRtInPut Options.Editing = False Width = 68 end + object Tv1issp: TcxGridDBColumn + Caption = #21452#21943 + DataBinding.FieldName = 'issp' + DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxComboBoxProperties' + Properties.Items.Strings = ( + '' + #21452#21943) + HeaderAlignmentHorz = taCenter + Width = 80 + end object Tv1C_width: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_width' diff --git a/E04梭织坯布仓库/U_TatDRtInPut.pas b/E04梭织坯布仓库/U_TatDRtInPut.pas index da69643..502d374 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.pas +++ b/E04梭织坯布仓库/U_TatDRtInPut.pas @@ -69,6 +69,7 @@ type TbPHSave: TToolButton; Label7: TLabel; ToCoID: TEdit; + Tv1issp: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -764,6 +765,8 @@ begin Append; FieldByName('C_code').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('C_code').Value; FieldByName('C_Name').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('C_Name').Value; + FieldByName('issp').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('issp').Value; + FieldByName('C_width').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('C_width').Value; FieldByName('C_GramWeight').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('C_GramWeight').Value; FieldByName('C_color').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('C_color').Value; diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj.local b/F01染色坯布仓库/DyeGreyClothStk.dproj.local index 4adc269..24b69d9 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dproj.local +++ b/F01染色坯布仓库/DyeGreyClothStk.dproj.local @@ -1,46 +1,46 @@  - 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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 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.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj 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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.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.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm - 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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.069,=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.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.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 diff --git a/F01染色坯布仓库/DyeGreyClothStk.identcache b/F01染色坯布仓库/DyeGreyClothStk.identcache index 65c8eaa..fe08070 100644 Binary files a/F01染色坯布仓库/DyeGreyClothStk.identcache and b/F01染色坯布仓库/DyeGreyClothStk.identcache differ diff --git a/F01染色坯布仓库/U_DyeGreyClothInList.dfm b/F01染色坯布仓库/U_DyeGreyClothInList.dfm index 0cb61e6..0b8fc71 100644 --- a/F01染色坯布仓库/U_DyeGreyClothInList.dfm +++ b/F01染色坯布仓库/U_DyeGreyClothInList.dfm @@ -752,8 +752,8 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList end end object Panel2: TPanel [4] - Left = 246 - Top = 110 + Left = 270 + Top = 88 Width = 336 Height = 240 TabOrder = 4