From eb09a18d9d6fe2d6a659600176df8cb68c782234 Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Fri, 28 Aug 2020 16:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5SubSite=E5=8F=98=E6=88=90?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Controller/SCP_PO_CONTROLLER.cs | 2 +-
SCP/Admin/profile.aspx | 2 +-
SCP/Views/PlanData/SCP_ASK.aspx | 6 ++++--
SCP/Views/PlanData/SCP_ASK.aspx.cs | 8 ++++++--
SCP/Views/PlanData/SCP_ASK.aspx.designer.cs | 4 ++--
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx | 6 +++---
SCP/Views/PlanData/SCP_PO.aspx | 3 ++-
SCP/Views/PlanData/SCP_PO.aspx.cs | 7 +++++--
SCP/Views/PlanData/SCP_PO.aspx.designer.cs | 4 ++--
SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx | 6 +++---
SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs | 4 ++--
.../PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs | 4 ++--
SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx.cs | 1 +
SCP/Views/PlanData/SCP_PO_EXTEND.aspx | 17 +++++++++--------
SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs | 10 +++++++---
.../PlanData/SCP_PO_EXTEND.aspx.designer.cs | 4 ++--
SCP/Views/SupplierData/SCP_ASK.aspx | 3 ++-
SCP/Views/SupplierData/SCP_ASK.aspx.cs | 5 ++++-
SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs | 4 ++--
SCP/Views/SupplierData/SCP_ASN.aspx | 3 ++-
SCP/Views/SupplierData/SCP_ASN.aspx.cs | 5 ++++-
SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs | 4 ++--
22 files changed, 68 insertions(+), 44 deletions(-)
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 @@
-
-
-
+
+
+
diff --git a/SCP/Views/PlanData/SCP_PO.aspx b/SCP/Views/PlanData/SCP_PO.aspx
index 3ce3547..61bc2c6 100644
--- a/SCP/Views/PlanData/SCP_PO.aspx
+++ b/SCP/Views/PlanData/SCP_PO.aspx
@@ -63,7 +63,8 @@
-
+
+
diff --git a/SCP/Views/PlanData/SCP_PO.aspx.cs b/SCP/Views/PlanData/SCP_PO.aspx.cs
index 072ad89..2fee186 100644
--- a/SCP/Views/PlanData/SCP_PO.aspx.cs
+++ b/SCP/Views/PlanData/SCP_PO.aspx.cs
@@ -48,7 +48,10 @@ namespace SCP.PlanData
}
public void SearchV_TB_PO(Action> p_action)
- {
+ {
+ var ls = SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList();
+ DropDownList1.DataSource = ls;
+ DropDownList1.DataBind();
V_TB_PO _entity = new V_TB_PO();
_entity.IsDeleted = false;
@@ -80,7 +83,7 @@ namespace SCP.PlanData
_entity.UserInAddress = CurrentUser.FactoryList;
_entity.UserInVendIds = CurrentUser.VenderList;
_entity.PartCode = TXT_PartCode.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_PO.aspx.designer.cs b/SCP/Views/PlanData/SCP_PO.aspx.designer.cs
index c12bd19..a9862cd 100644
--- a/SCP/Views/PlanData/SCP_PO.aspx.designer.cs
+++ b/SCP/Views/PlanData/SCP_PO.aspx.designer.cs
@@ -150,13 +150,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_PO_CREATE_ASK.aspx b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
index bf799c9..11cf507 100644
--- a/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
+++ b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
@@ -43,8 +43,8 @@
-
-
+
+
@@ -158,7 +158,7 @@
+ HeaderText="子网站" Hidden="true">
diff --git a/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
index cf13e17..1db3211 100644
--- a/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
+++ b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
@@ -73,7 +73,7 @@ namespace SCP.PlanData
this.TXT_State_DESC.Text = _result.State_DESC;
this.TXT_VendName.Text = _result.VendName;
this.txtRemark.Text = _result.Remark;
- this.DropDownList1.Text = _result.SubSite;
+ this.TXT_SubSite.Text = _result.SubSite;
this.TXT_Extend1.Text = _result.Extend1;
this.TXT_Extend2.Text = _result.Extend2;
this.TXT_Extend3.Text = _result.Extend3;
@@ -156,7 +156,7 @@ namespace SCP.PlanData
protected void btnRelease_Click(object sender, EventArgs e)
{
var qadOrder = Session["order"] as V_TB_PO;
- qadOrder.SubSite =DropDownList1.Text;
+ qadOrder.SubSite =TXT_SubSite.Text;
qadOrder.Extend1 = TXT_Extend1.Text;
qadOrder.Extend2 = TXT_Extend2.Text;
qadOrder.Extend3 = TXT_Extend3.Text;
diff --git a/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs
index af7d20b..fe135d1 100644
--- a/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs
+++ b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs
@@ -105,13 +105,13 @@ namespace SCP.PlanData
protected global::FineUI.TextBox TXT_VendId;
///
- /// DropDownList1 控件。
+ /// TXT_SubSite 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUI.DropDownList DropDownList1;
+ protected global::FineUI.TextBox TXT_SubSite;
///
/// TXT_Extend1 控件。
diff --git a/SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx.cs b/SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx.cs
index 156a09f..5689d0a 100644
--- a/SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx.cs
+++ b/SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx.cs
@@ -67,6 +67,7 @@ namespace SCP.PlanData
}
protected void ddlGridPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
+ Grid_V_TB_PO_DETAIL.PageSize = Convert.ToInt32(ddlGridPageSize.SelectedValue);
BindDetail();
}
diff --git a/SCP/Views/PlanData/SCP_PO_EXTEND.aspx b/SCP/Views/PlanData/SCP_PO_EXTEND.aspx
index 92a6423..111d235 100644
--- a/SCP/Views/PlanData/SCP_PO_EXTEND.aspx
+++ b/SCP/Views/PlanData/SCP_PO_EXTEND.aspx
@@ -52,8 +52,7 @@
-
-
+
@@ -73,12 +72,14 @@
-
-
-
-
-
-
+
+
+ <%-- --%>
+
+
+
+
+
diff --git a/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs b/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs
index bd5b33f..6597746 100644
--- a/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs
+++ b/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs
@@ -49,7 +49,11 @@ namespace SCP.PlanData
}
public void SearchV_TB_PO(Action> p_action)
- {
+ {
+
+ var ls=SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList();
+ DropDownList1.DataSource = ls;
+ DropDownList1.DataBind();
V_TB_PO _entity = new V_TB_PO();
_entity.IsDeleted = false;
if (this.DP_StartDate.SelectedDate != null)
@@ -73,7 +77,7 @@ namespace SCP.PlanData
}
_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;
@@ -105,7 +109,7 @@ namespace SCP.PlanData
protected void Grid_V_TB_PO_Sort(object sender, FineUI.GridSortEventArgs e)
{
-
+
}
protected void btnOutput_Click(object sender, EventArgs e)
diff --git a/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs b/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs
index ef53eb0..45fbb44 100644
--- a/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs
+++ b/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs
@@ -132,13 +132,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/SupplierData/SCP_ASK.aspx b/SCP/Views/SupplierData/SCP_ASK.aspx
index 6d965c9..851d2a0 100644
--- a/SCP/Views/SupplierData/SCP_ASK.aspx
+++ b/SCP/Views/SupplierData/SCP_ASK.aspx
@@ -57,7 +57,8 @@
-
+
+
diff --git a/SCP/Views/SupplierData/SCP_ASK.aspx.cs b/SCP/Views/SupplierData/SCP_ASK.aspx.cs
index 9d3df0a..cc181db 100644
--- a/SCP/Views/SupplierData/SCP_ASK.aspx.cs
+++ b/SCP/Views/SupplierData/SCP_ASK.aspx.cs
@@ -83,6 +83,9 @@ namespace SCP.Views.SupplierData
}
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;
@@ -90,7 +93,7 @@ namespace SCP.Views.SupplierData
_entity.State_DESC = TXT_Site_Desc.Text;
_entity.AskBillNum = TXT_AskBillNo.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/SupplierData/SCP_ASK.aspx.designer.cs b/SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs
index 3143ba4..9c7c85c 100644
--- a/SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs
+++ b/SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs
@@ -159,13 +159,13 @@ namespace SCP.Views.SupplierData
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/SupplierData/SCP_ASN.aspx b/SCP/Views/SupplierData/SCP_ASN.aspx
index aa40674..ff714e0 100644
--- a/SCP/Views/SupplierData/SCP_ASN.aspx
+++ b/SCP/Views/SupplierData/SCP_ASN.aspx
@@ -61,7 +61,8 @@
-
+
+
diff --git a/SCP/Views/SupplierData/SCP_ASN.aspx.cs b/SCP/Views/SupplierData/SCP_ASN.aspx.cs
index f5ddd61..f7d0d0b 100644
--- a/SCP/Views/SupplierData/SCP_ASN.aspx.cs
+++ b/SCP/Views/SupplierData/SCP_ASN.aspx.cs
@@ -60,6 +60,9 @@ namespace SCP.SupplierData
}
public void SearchV_TB_ASN(Action> p_action)
{
+ var ls = SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList();
+ DropDownList1.DataSource = ls;
+ DropDownList1.DataBind();
V_TB_ASN _entity = new V_TB_ASN();
_entity.IsDeleted = false;
_entity.VendId = TXT_VenderName.Text;
@@ -68,7 +71,7 @@ namespace SCP.SupplierData
_entity.AskBillNum = TXT_ASK.Text;
_entity.UserInVendIds = CurrentUser.VenderList;
_entity.UserInAddress = CurrentUser.FactoryList;
- _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/SupplierData/SCP_ASN.aspx.designer.cs b/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
index 1d75f34..a889931 100644
--- a/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
+++ b/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
@@ -186,13 +186,13 @@ namespace SCP.SupplierData
protected global::FineUI.TextBox txtPO;
///
- /// TXT_SubSite 控件。
+ /// DropDownList1 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUI.TextBox TXT_SubSite;
+ protected global::FineUI.DropDownList DropDownList1;
///
/// TXT_Extend1 控件。