diff --git a/A00通用窗体/U_SalesContract_SXSel.dfm b/A00通用窗体/U_SalesContract_SXSel.dfm index 8ac4137..f48e19f 100644 --- a/A00通用窗体/U_SalesContract_SXSel.dfm +++ b/A00通用窗体/U_SalesContract_SXSel.dfm @@ -3,14 +3,14 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel Top = 106 Caption = #21512#21516#32433#32447#36873#25321 ClientHeight = 558 - ClientWidth = 1564 + ClientWidth = 1540 Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -12 Font.Name = #23435#20307 Position = poScreenCenter OnClose = FormClose - ExplicitWidth = 1580 + ExplicitWidth = 1556 ExplicitHeight = 597 PixelsPerInch = 96 TextHeight = 12 @@ -18,7 +18,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel Tag = 1 Left = 0 Top = 0 - Width = 1564 + Width = 1540 Height = 38 AutoSize = True ButtonHeight = 38 @@ -64,12 +64,14 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel object Panel1: TPanel [1] Left = 0 Top = 38 - Width = 1564 + Width = 1540 Height = 44 Align = alTop BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 1 + ExplicitLeft = 8 + ExplicitTop = 36 object Label1: TLabel Left = 18 Top = 15 @@ -78,7 +80,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel Caption = #21512#21516#21495 end object Label2: TLabel - Left = 450 + Left = 451 Top = 15 Width = 48 Height = 12 @@ -93,7 +95,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel end object ConNo: TEdit Tag = 2 - Left = 60 + Left = 64 Top = 11 Width = 169 Height = 20 @@ -102,7 +104,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel end object C_Name: TEdit Tag = 2 - Left = 500 + Left = 514 Top = 11 Width = 169 Height = 20 @@ -111,7 +113,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel end object BuyName: TEdit Tag = 2 - Left = 272 + Left = 277 Top = 11 Width = 169 Height = 20 @@ -122,7 +124,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel object cxGrid1: TcxGrid [2] Left = 0 Top = 82 - Width = 1564 + Width = 1540 Height = 476 Align = alClient BorderStyle = cxcbsNone @@ -184,6 +186,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False + Width = 88 end object TV1Column6: TcxGridDBColumn Caption = #23458#25143#21333#21495 @@ -198,6 +201,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False + Width = 88 end object TV1Column3: TcxGridDBColumn Caption = #23458#25143 @@ -205,6 +209,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False + Width = 88 end object TV1Column4: TcxGridDBColumn Caption = #20013#38388#21830 @@ -212,14 +217,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - end - object v1Column5: TcxGridDBColumn - Caption = #35268#26684 - DataBinding.FieldName = 'C_Spec' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 60 + Width = 88 end object TV1Column2: TcxGridDBColumn Caption = #20132#36135#26085#26399 @@ -227,7 +225,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 72 + Width = 88 end object VC_SCSCode: TcxGridDBColumn Caption = #20135#21697#32534#21495 @@ -242,7 +240,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel Properties.ReadOnly = False HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 77 + Width = 88 end object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 @@ -250,7 +248,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 70 + Width = 88 end object cxGridDBColumn3: TcxGridDBColumn Caption = #20135#21697#33521#25991#21517 @@ -267,21 +265,87 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel Options.Editing = False Width = 89 end + object TV1Column13: TcxGridDBColumn + Caption = #32433#32447#32534#21495 + DataBinding.FieldName = 'Y_Code' + DataBinding.IsNullValueType = True + FooterAlignmentHorz = taCenter + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + Width = 75 + end + object TV1Column14: TcxGridDBColumn + Caption = #32433#32447#21517#31216 + DataBinding.FieldName = 'Y_Name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 71 + end + object v1Column5: TcxGridDBColumn + Caption = #35268#26684 + DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 88 + end object cxGridDBColumn4: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 70 + Width = 88 + end + object TV1Column9: TcxGridDBColumn + Caption = #20998#29305'(Dtex)' + DataBinding.FieldName = 'Denier' + DataBinding.IsNullValueType = True + FooterAlignmentHorz = taCenter + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + Width = 89 + end + object TV1Column10: TcxGridDBColumn + Caption = #25903#25968 + DataBinding.FieldName = 'ZS' + DataBinding.IsNullValueType = True + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + HeaderGlyphAlignmentHorz = taCenter + Width = 88 + end + object TV1Column11: TcxGridDBColumn + Caption = #32442#27861 + DataBinding.FieldName = 'FF' + DataBinding.IsNullValueType = True + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + Width = 88 + end + object TV1Column8: TcxGridDBColumn + Caption = #32463#19997'/'#32428#19997 + DataBinding.FieldName = 'YRType' + DataBinding.IsNullValueType = True + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + Width = 87 + end + object TV1Column12: TcxGridDBColumn + Caption = #25467#24230 + DataBinding.FieldName = 'ND' + DataBinding.IsNullValueType = True + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + Width = 88 end object cxGridDBColumn5: TcxGridDBColumn Caption = #39068#33394 - DataBinding.FieldName = 'C_Color' + DataBinding.FieldName = 'Y_Color' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 70 + Width = 88 end object cxGridDBColumn6: TcxGridDBColumn Caption = #33394#21495 @@ -289,7 +353,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 57 + Width = 88 end object cxGridDBColumn7: TcxGridDBColumn Caption = #27454#21495 diff --git a/A00通用窗体/U_SalesContract_SXSel.pas b/A00通用窗体/U_SalesContract_SXSel.pas index a607884..839b5b4 100644 --- a/A00通用窗体/U_SalesContract_SXSel.pas +++ b/A00通用窗体/U_SalesContract_SXSel.pas @@ -78,6 +78,13 @@ type C_Name: TEdit; Label3: TLabel; BuyName: TEdit; + TV1Column8: TcxGridDBColumn; + TV1Column9: TcxGridDBColumn; + TV1Column10: TcxGridDBColumn; + TV1Column11: TcxGridDBColumn; + TV1Column12: TcxGridDBColumn; + TV1Column13: TcxGridDBColumn; + TV1Column14: TcxGridDBColumn; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -150,8 +157,42 @@ begin begin Close; sql.Clear; - sql.Add('select A.*,B.* from BS_Contract_Main A inner join BS_Contract_Sub B on A.ConMId=B.ConMId '); - sql.Add(' and isnull(A.status,''0'')=''9'''); + //sql.Add('select A.*,B.* from BS_Contract_Main A inner join BS_Contract_Sub B on A.ConMId=B.ConMId '); + //sql.Add(' and isnull(A.status,''0'')=''9'''); + SQL.Add('SELECT DISTINCT'); + SQL.Add(' A.ConNo,'); + SQL.Add(' A.BuyConNo,'); + SQL.Add(' A.SellName,'); + SQL.Add(' A.BuyName,'); + SQL.Add(' A.MiddleName,'); + SQL.Add(' B.C_Spec,'); + SQL.Add(' A.DlyDate,'); + SQL.Add(' B.C_Code,'); + SQL.Add(' C.C_Name,'); + SQL.Add(' C.C_EName,'); + SQL.Add(' C.C_Composition,'); + SQL.Add(' C.C_Color,'); + SQL.Add(' C.C_ColorNo,'); + SQL.Add(' C.C_StyleNo,'); + SQL.Add(' C.C_Pattern,'); + SQL.Add(' C.C_Width,'); + SQL.Add(' C.C_GramWeight,'); + SQL.Add(' D.Y_Code,'); + SQL.Add(' D.Y_Name,'); + SQL.Add(' B.ConQty,'); + SQL.Add(' B.ConUnit,'); + SQL.Add(' B.ConSNote,'); + SQL.Add(' D.YRType,'); + SQL.Add(' D.Denier,'); + SQL.Add(' C.ZS,'); + SQL.Add(' D.FF,'); + SQL.Add(' D.ND'); + SQL.Add('FROM Bs_Contract_Main A'); + SQL.Add('INNER JOIN Bs_Contract_Sub B ON A.ConMId = B.ConMId'); + SQL.Add('INNER JOIN Bs_Cloth_Info C ON B.C_Code = C.C_Code'); + SQL.Add('INNER JOIN BS_Cloth_Yarn D ON C.BCIID = D.BCIID'); + SQL.Add('WHERE A.Status = ''9'''); + Open; end; SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2)); diff --git a/B04采购计划管理/PurchasePlan.dproj.local b/B04采购计划管理/PurchasePlan.dproj.local index 3134acc..ab739ea 100644 --- a/B04采购计划管理/PurchasePlan.dproj.local +++ b/B04采购计划管理/PurchasePlan.dproj.local @@ -1,54 +1,54 @@  + 1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm 1899-12-30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.pas - 1899-12-30 00:00:00.000.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas= - 1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.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.724,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\Unit1.pas= 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899-12-30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.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.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas - 1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas - 1899-12-30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.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.503,=D:\Dp10RepoV1\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.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.pas - 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas - 1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj - 1899-12-30 00:00:00.000.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas - 2025-05-22 15:29:18.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas - 2025-05-22 15:29:29.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm - 2025-05-22 15:29:29.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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\A00通用窗体\U_AttachmentUpload.pas + 1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas + 1899-12-30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899-12-30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas + 1899-12-30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas + 1899-12-30 00:00:00.000.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas + 1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas + 1899-12-30 00:00:00.000.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas + 1899-12-30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899-12-30 00:00:00.000.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.931,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899-12-30 00:00:00.000.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas + 1899-12-30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas + 1899-12-30 00:00:00.000.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.pas + 1899-12-30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj + 1899-12-30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas @@ -79,7 +79,7 @@ - + diff --git a/B04采购计划管理/PurchasePlan.identcache b/B04采购计划管理/PurchasePlan.identcache index 64f41b5..8d9142d 100644 Binary files a/B04采购计划管理/PurchasePlan.identcache and b/B04采购计划管理/PurchasePlan.identcache differ diff --git a/B04采购计划管理/U_YarnPurchasePlanList.dfm b/B04采购计划管理/U_YarnPurchasePlanList.dfm index 41d52ba..ff4257f 100644 --- a/B04采购计划管理/U_YarnPurchasePlanList.dfm +++ b/B04采购计划管理/U_YarnPurchasePlanList.dfm @@ -2,13 +2,13 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList Left = 246 Top = 116 Caption = #32433#32447#37319#36141#35745#21010 - ClientHeight = 737 + ClientHeight = 735 ClientWidth = 1364 Font.Height = -16 FormStyle = fsMDIChild Visible = True ExplicitWidth = 1380 - ExplicitHeight = 776 + ExplicitHeight = 774 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -178,7 +178,7 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList Left = 0 Top = 168 Width = 1364 - Height = 294 + Height = 292 Align = alClient PopupMenu = pm1 TabOrder = 3 @@ -490,12 +490,18 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList end object cxSplitter1: TcxSplitter [4] Left = 0 - Top = 729 + Top = 727 Width = 1364 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom end + inherited loadProcess: TPanel + Left = 454 + Top = 243 + ExplicitLeft = 454 + ExplicitTop = 243 + end inherited cxProgressBar2: TcxProgressBar Left = 391 Top = 295 @@ -505,7 +511,7 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList end object cxGrid2: TcxGrid [7] Left = 0 - Top = 462 + Top = 460 Width = 1364 Height = 267 Align = alBottom @@ -637,6 +643,15 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList Options.Editing = False Width = 70 end + object Tv2Column1: TcxGridDBColumn + Caption = #32463#19997#32428#19997 + DataBinding.FieldName = 'YRType' + DataBinding.IsNullValueType = True + FooterAlignmentHorz = taCenter + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + Width = 100 + end object cxGridDBColumn4: TcxGridDBColumn Caption = #25467#24230 DataBinding.FieldName = 'ND' diff --git a/B04采购计划管理/U_YarnPurchasePlanList.pas b/B04采购计划管理/U_YarnPurchasePlanList.pas index 661e0a9..3c8582d 100644 --- a/B04采购计划管理/U_YarnPurchasePlanList.pas +++ b/B04采购计划管理/U_YarnPurchasePlanList.pas @@ -113,6 +113,7 @@ type v1Column2: TcxGridDBColumn; cxGridLevel1: TcxGridLevel; d: TcxGridDBColumn; + Tv2Column1: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/B04采购计划管理/U_YarnPurchasePlanPut.dfm b/B04采购计划管理/U_YarnPurchasePlanPut.dfm index 1da1855..fbbfdca 100644 --- a/B04采购计划管理/U_YarnPurchasePlanPut.dfm +++ b/B04采购计划管理/U_YarnPurchasePlanPut.dfm @@ -115,8 +115,6 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut Align = alClient BorderStyle = cxcbsNone TabOrder = 2 - ExplicitLeft = -6 - ExplicitTop = 192 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -217,7 +215,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut end object v1Column4: TcxGridDBColumn Caption = #35268#26684 - DataBinding.FieldName = 'Y_Spec' + DataBinding.FieldName = 'C_Spec' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False @@ -255,6 +253,14 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut Options.Editing = False Width = 70 end + object Tv1Column6: TcxGridDBColumn + Caption = #32463#19997'/'#32428#19997 + DataBinding.FieldName = 'YRType' + DataBinding.IsNullValueType = True + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + Width = 97 + end object Tv1Column1: TcxGridDBColumn Caption = #25467#24230 DataBinding.FieldName = 'ND' @@ -668,8 +674,8 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut object ADOCmd: TADOQuery Connection = DataLink_PurchasePlan.ADOLink Parameters = <> - Left = 952 - Top = 341 + Left = 912 + Top = 286 end object DS_1: TDataSource DataSet = Order_Sub @@ -690,8 +696,8 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut Top = 348 end object pm_sub: TPopupMenu - Left = 624 - Top = 536 + Left = 598 + Top = 323 object N1: TMenuItem Caption = #26222#36890#26367#25442 OnClick = N1Click diff --git a/B04采购计划管理/U_YarnPurchasePlanPut.pas b/B04采购计划管理/U_YarnPurchasePlanPut.pas index 2fb5dc1..3c6679c 100644 --- a/B04采购计划管理/U_YarnPurchasePlanPut.pas +++ b/B04采购计划管理/U_YarnPurchasePlanPut.pas @@ -88,6 +88,7 @@ type ToolButton4: TToolButton; Tv1Column4: TcxGridDBColumn; ToolButton5: TToolButton; + Tv1Column6: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -823,10 +824,10 @@ begin FieldByName('PurSId').Value := maxno + INTTOSTR(i); FieldByName('C_Degree').Value := 'ɴ'; - FieldByName('Y_Code').Value := CDS_1.fieldbyname('Y_Code').value; - FieldByName('Y_Name').Value := CDS_1.fieldbyname('Y_Name').value; - FieldByName('Y_Spec').Value := CDS_1.fieldbyname('Y_Spec').value; - FieldByName('Y_Composition').Value := CDS_1.fieldbyname('Y_Composition').value; + FieldByName('Y_Code').Value := CDS_1.fieldbyname('C_Code').value; + FieldByName('Y_Name').Value := CDS_1.fieldbyname('C_Name').value; + FieldByName('Y_Spec').Value := CDS_1.fieldbyname('C_Spec').value; + FieldByName('Y_Composition').Value := CDS_1.fieldbyname('C_Composition').value; FieldByName('Denier').Value := CDS_1.fieldbyname('Denier').value; FieldByName('ZS').Value := CDS_1.fieldbyname('ZS').value; @@ -834,7 +835,7 @@ begin FieldByName('FF').Value := CDS_1.fieldbyname('FF').value; FieldByName('ND').Value := Cds_1.FieldByName('ND').Value; - FieldByName('Y_Color').Value := Cds_1.FieldByName('Y_Color').Value; + FieldByName('Y_Color').Value := Cds_1.FieldByName('C_Color').Value; FieldByName('Qty').Value := 0; FieldByName('Price').Value := 0; @@ -954,7 +955,7 @@ begin SetXH(); end; -procedure TfrmYarnPurchasePlanPut.ToolButton5Click(Sender: TObject); +procedure TfrmYarnPurchasePlanPut.ToolButton5Click(Sender: TObject); //ͬ var i, SZ: Integer; maxno, MAX_BCPH, ZM: string; @@ -990,10 +991,10 @@ begin FieldByName('PurSId').Value := maxno + INTTOSTR(i); FieldByName('C_Degree').Value := 'ɴ'; - FieldByName('Y_Code').Value := CDS_1.fieldbyname('Y_Code').value; - FieldByName('Y_Name').Value := CDS_1.fieldbyname('Y_Name').value; - FieldByName('Y_Spec').Value := CDS_1.fieldbyname('Y_Spec').value; - FieldByName('Y_Composition').Value := CDS_1.fieldbyname('Y_Composition').value; + FieldByName('Y_Code').Value := CDS_1.fieldbyname('C_Code').value; + FieldByName('Y_Name').Value := CDS_1.fieldbyname('C_Name').value; + FieldByName('Y_Spec').Value := CDS_1.fieldbyname('C_Spec').value; + FieldByName('Y_Composition').Value := CDS_1.fieldbyname('C_Composition').value; FieldByName('Denier').Value := CDS_1.fieldbyname('Denier').value; FieldByName('ZS').Value := CDS_1.fieldbyname('ZS').value; @@ -1001,7 +1002,8 @@ begin FieldByName('FF').Value := CDS_1.fieldbyname('FF').value; FieldByName('ND').Value := Cds_1.FieldByName('ND').Value; - FieldByName('Y_Color').Value := Cds_1.FieldByName('Y_Color').Value; + FieldByName('Y_Color').Value := Cds_1.FieldByName('C_Color').Value; + FieldByName('YRType').Value := Cds_1.FieldByName('YRType').Value; FieldByName('Qty').Value := 0; FieldByName('Price').Value := 0;