diff --git a/Controller/SCP_PO_CONTROLLER.cs b/Controller/SCP_PO_CONTROLLER.cs index a766459..e24b7b1 100644 --- a/Controller/SCP_PO_CONTROLLER.cs +++ b/Controller/SCP_PO_CONTROLLER.cs @@ -244,7 +244,7 @@ namespace CK.SCP.Controller if (_detail.PoBillNum == itm.PoBillNum && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode) { _detail.ReceivedQty = itm.ReceiveSum; - + } }); diff --git a/SCP/Admin/profile.aspx b/SCP/Admin/profile.aspx index 329ae4e..b64be09 100644 --- a/SCP/Admin/profile.aspx +++ b/SCP/Admin/profile.aspx @@ -25,7 +25,7 @@ - diff --git a/SCP/Views/PlanData/SCP_ASK.aspx b/SCP/Views/PlanData/SCP_ASK.aspx index 033e2e0..b8826a0 100644 --- a/SCP/Views/PlanData/SCP_ASK.aspx +++ b/SCP/Views/PlanData/SCP_ASK.aspx @@ -67,12 +67,14 @@ - diff --git a/SCP/Views/PlanData/SCP_ASK.aspx.cs b/SCP/Views/PlanData/SCP_ASK.aspx.cs index b7475f7..d2ac610 100644 --- a/SCP/Views/PlanData/SCP_ASK.aspx.cs +++ b/SCP/Views/PlanData/SCP_ASK.aspx.cs @@ -23,6 +23,7 @@ using System.IO; using CK.SCP.Models.ScpEntity.ExcelImportEntity; using CK.SCP.Models.ScpEntity.ExcelExportEnttity; using System.Drawing; +using System.Linq.Dynamic; namespace SCP.PlanData { @@ -55,7 +56,7 @@ namespace SCP.PlanData var column2= Grid_V_TB_ASK.FindColumn("EndTime"); column2.HeaderText = "需求日期"; column2.Hidden = false; - } + } } if (CurrentUser.Name == "admin" || CurrentUser.RoleList.Contains("分厂管理员")) { @@ -79,6 +80,9 @@ namespace SCP.PlanData public void SearchV_TB_ASKData(Action> p_action) { + var ls = SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList(); + DropDownList1.DataSource = ls; + DropDownList1.DataBind(); V_TB_ASK _entity = new V_TB_ASK(); _entity.IsDeleted = false; _entity.PoBillNum = TXT_BillNo.Text; @@ -86,7 +90,7 @@ namespace SCP.PlanData _entity.State_DESC = TXT_Site_Desc.Text; _entity.AskBillNum = TXT_AskBill.Text; _entity.ErpBillNum = TXT_ProjectId.Text; - _entity.SubSite = TXT_SubSite.Text; + _entity.SubSite = DropDownList1.SelectedValue; _entity.Extend1 = TXT_Extend1.Text; _entity.Extend2 = TXT_Extend2.Text; _entity.Extend3 = TXT_Extend3.Text; diff --git a/SCP/Views/PlanData/SCP_ASK.aspx.designer.cs b/SCP/Views/PlanData/SCP_ASK.aspx.designer.cs index 88daab3..c215e9b 100644 --- a/SCP/Views/PlanData/SCP_ASK.aspx.designer.cs +++ b/SCP/Views/PlanData/SCP_ASK.aspx.designer.cs @@ -204,13 +204,13 @@ namespace SCP.PlanData protected global::FineUI.TextBox TXT_BillNo; /// - /// TXT_SubSite 控件。 + /// DropDownList1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUI.TextBox TXT_SubSite; + protected global::FineUI.DropDownList DropDownList1; /// /// TXT_Extend1 控件。 diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx index ee117ce..ccc3ceb 100644 --- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx +++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx @@ -123,9 +123,9 @@ - - - +