diff --git a/Controller/SCP_ASK_CONTROLLER.cs b/Controller/SCP_ASK_CONTROLLER.cs index 5ecbb42..d7d4672 100644 --- a/Controller/SCP_ASK_CONTROLLER.cs +++ b/Controller/SCP_ASK_CONTROLLER.cs @@ -403,6 +403,22 @@ namespace CK.SCP.Controller { q = q.Where(p => p.AskQty == p.ReduceQty + p.Qty); } + if (!string.IsNullOrEmpty(p_entity.SubSite)) + { + q = q.Where(p => p.SubSite == p_entity.SubSite); + } + if (!string.IsNullOrEmpty(p_entity.Extend1)) + { + q = q.Where(p => p.Extend1 == p_entity.Extend1); + } + if (!string.IsNullOrEmpty(p_entity.Extend2)) + { + q = q.Where(p => p.Extend2 == p_entity.Extend2); + } + if (!string.IsNullOrEmpty(p_entity.Extend3)) + { + q = q.Where(p => p.Extend3 == p_entity.Extend3); + } q = q.Where(p => p.IsDeleted == p_entity.IsDeleted); _ret.State = ReturnStatus.Succeed; _ret.Result = q; diff --git a/Models/ScpEntity/V_TB_INCOMPLETE_ASK.cs b/Models/ScpEntity/V_TB_INCOMPLETE_ASK.cs index 83cbfd2..249f400 100644 --- a/Models/ScpEntity/V_TB_INCOMPLETE_ASK.cs +++ b/Models/ScpEntity/V_TB_INCOMPLETE_ASK.cs @@ -56,5 +56,9 @@ [NotMapped] public DateTime? EndTimeStart { get; set; } + public String SubSite { get; set; } + public String Extend1 { get; set; } + public String Extend2 { get; set; } + public String Extend3 { get; set; } } } \ No newline at end of file diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx index 926e9a8..47d3112 100644 --- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx +++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx @@ -52,14 +52,14 @@ - <%-- + - + - + + + - - --%> @@ -91,7 +91,7 @@ @@ -122,11 +122,11 @@ - <%-- + - --%> + diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs index b578f8a..5bcee72 100644 --- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs +++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs @@ -86,6 +86,22 @@ namespace SCP.PlanData { _entity.PartDesc1 = TextPartName.Text; } + if (TextSubSite.Text != null) + { + _entity.SubSite = TextSubSite.Text; + } + if (TextExtend1.Text != null) + { + _entity.Extend1 = TextExtend1.Text; + } + if (TextExtend2.Text != null) + { + _entity.Extend2 = TextExtend2.Text; + } + if (TextExtend3.Text != null) + { + _entity.Extend3 = TextExtend3.Text; + } if (!string.IsNullOrEmpty(CurrentUser.Name)) { if (CurrentUser.Name != "admin") @@ -199,6 +215,10 @@ namespace SCP.PlanData { "EndTime", "到货日期" }, { "Buyer", "计划员" }, { "ValidityDays", "距到货日期(天)" }, + {"SubSite","" }, + {"Extend1","" }, + {"Extend2","" }, + {"Extend3","" }, }; string url = EntityListToExcel2003(cellheader, ret.Result.ToList(), "未完成订单明细"); } diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs index a5467d7..3d38a84 100644 --- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs +++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs @@ -185,6 +185,42 @@ namespace SCP.PlanData /// protected global::FineUI.TextBox TextPartName; + /// + /// TextSubSite 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.TextBox TextSubSite; + + /// + /// TextExtend1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.TextBox TextExtend1; + + /// + /// TextExtend2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.TextBox TextExtend2; + + /// + /// TextExtend3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUI.TextBox TextExtend3; + /// /// FormRow_3 控件。 ///