diff --git a/Controller/SCP_EXCEL_CONTROLLER.cs b/Controller/SCP_EXCEL_CONTROLLER.cs index dc2ae14..e1b09e3 100644 --- a/Controller/SCP_EXCEL_CONTROLLER.cs +++ b/Controller/SCP_EXCEL_CONTROLLER.cs @@ -113,9 +113,6 @@ namespace CK.SCP.Controller po_detail.收货口 = itm.DockCode; po_detail.项目编号 = itm.ProjectId; po_detail.备注 = string.Empty; - po_detail.预测一 = "0"; - po_detail.预测二 = "0"; - po_detail.预测三 = "0"; _exportDetailList.Add(po_detail); }); @@ -259,9 +256,6 @@ namespace CK.SCP.Controller _entity.要货数量 = itm.AskQty.ToString(); _entity.说明 = string.IsNullOrEmpty(itm.Remark)?string.Empty:itm.Remark.ToString(); _entity.到货日期 = itm.EndTime == null ? string.Empty : itm.EndTime.Value.ToString("yyyyMMdd"); - _entity.预测一 = itm.Extend1.ToString(); - _entity.预测二= itm.Extend2.ToString(); - _entity.预测三 = itm.Extend3.ToString(); _exportDetailList.Add(_entity); }); diff --git a/Controller/SCP_PO_CONTROLLER.cs b/Controller/SCP_PO_CONTROLLER.cs index 1930767..d366f22 100644 --- a/Controller/SCP_PO_CONTROLLER.cs +++ b/Controller/SCP_PO_CONTROLLER.cs @@ -1012,9 +1012,6 @@ namespace CK.SCP.Controller _t_ASK_Detail.GUID = Guid.NewGuid(); _t_ASK_Detail.Remark = _ask.Site; _t_ASK_Detail.UpdateInfo = itm.备注; - _t_ASK_Detail.Extend1 = itm.预测一; - _t_ASK_Detail.Extend2 = itm.预测二; - _t_ASK_Detail.Extend3 = itm.预测三; db.TB_ASK_DETAIL.Add(_t_ASK_Detail); _ls.Add(_t_ASK_Detail); // _number++; diff --git a/Models/ScpEntity/ExcelExportEnttity/SCP_ASK_DETAIL_EXPORT.cs b/Models/ScpEntity/ExcelExportEnttity/SCP_ASK_DETAIL_EXPORT.cs index fb249f8..7a43c24 100644 --- a/Models/ScpEntity/ExcelExportEnttity/SCP_ASK_DETAIL_EXPORT.cs +++ b/Models/ScpEntity/ExcelExportEnttity/SCP_ASK_DETAIL_EXPORT.cs @@ -20,9 +20,9 @@ namespace CK.SCP.Models.ScpEntity.ExcelExportEnttity public string 要货数量 {get;set;} //"AskQty" public string 说明 { get; set; } //"ReMark" public string 到货日期 { get; set; } - public string 预测一 { get; set; } //"OneMonth" - public string 预测二 { get; set; } //"TwoMonth" - public string 预测三 { get; set; } //"ThreeMonth" + //public string 预测一 { get; set; } //"OneMonth" + //public string 预测二 { get; set; } //"TwoMonth" + //public string 预测三 { get; set; } //"ThreeMonth" } } diff --git a/Models/ScpEntity/ExcelExportEnttity/SCP_PO_DETAIL_EXPORT.cs b/Models/ScpEntity/ExcelExportEnttity/SCP_PO_DETAIL_EXPORT.cs index f5d8bb3..231aaef 100644 --- a/Models/ScpEntity/ExcelExportEnttity/SCP_PO_DETAIL_EXPORT.cs +++ b/Models/ScpEntity/ExcelExportEnttity/SCP_PO_DETAIL_EXPORT.cs @@ -45,31 +45,6 @@ namespace CK.SCP.Models.ScpEntity.ExcelExportEnttity public string 站点 { get; set; } public string 收货口 { get; set; } public string 备注 { get; set; } - - public string 预测一 { get; set; } - public string 预测二 { get; set; } - public string 预测三{ get; set; } - - - - - - - - - - - - - - - - - - - - - } //public class SCP_PO_EXPORT_IMPORT_MODEL //{ diff --git a/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx b/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx index ad929b1..1064753 100644 --- a/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx +++ b/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx @@ -109,9 +109,6 @@