Merge branch 'master' of https://gitee.com/zxyabc/COMONE

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;
-
+                                     
                             }
 
                         });

SCP/Admin/profile.aspx

@@ -25,7 +25,7 @@
                     <f:TextBox ID="tbxConfirmNewPassword" TextMode="Password" runat="server" Label="确认新密码"
                         Required="true" ShowRedStar="true">
                     </f:TextBox>
-                    <f:Button ID="btnSave" runat="server" Icon="SystemSave" OnClick="btnSave_OnClick"
+                    <f:Button ID="btnSave" runat="server" Icon="BasketEdit" OnClick="btnSave_OnClick"
                         ValidateForms="SimpleForm1" ValidateTarget="Top" Text="修改密码">
                     </f:Button>
                       

SCP/Views/PlanData/SCP_ASK.aspx

@@ -67,12 +67,14 @@
                                 <f:FormRow runat="server">
                                     <Items>
                                        <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo"  />
-                                          <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />
+                                        <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName"  DataValueField=" ErpDomain">
+                                        </f:DropDownList>
+                                         <%-- <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />--%>
                                           <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1"   Hidden="true" />
                                           <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2"   Hidden="true" />
                                           <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3"   Hidden="true" />
                                        <f:TextBox runat = "server" Label = "看板编号" EmptyText = "" ID = "TXT_AskBill"   Hidden="true" />
-                                       <f:DropDownList ID="ddl_Vender" runat="server" Label="供应商"   EnableEdit="true"   ></f:DropDownList>
+                                       <f:DropDownList ID="ddl_Vender" runat="server" Label="供应商"  EnableEdit="true"   ></f:DropDownList>
                                        <f:TextBox runat = "server" Label = "送货地点" EmptyText = "" ID = "TXT_Site_Desc"   />
                                     </Items>
                                 </f:FormRow>

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<IQueryable<V_TB_ASK>> 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;

SCP/Views/PlanData/SCP_ASK.aspx.designer.cs

@@ -204,13 +204,13 @@ namespace SCP.PlanData
         protected global::FineUI.TextBox TXT_BillNo;
 
         /// <summary>
-        /// TXT_SubSite 控件。
+        /// DropDownList1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox TXT_SubSite;
+        protected global::FineUI.DropDownList DropDownList1;
 
         /// <summary>
         /// TXT_Extend1 控件。

SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx

@@ -123,9 +123,9 @@
 
                         <f:BoundField Width = "100px" DataField = "ValidityDays"  HeaderText = "距到货日期（天）" />
                          <f:BoundField Width = "100px" DataField = "SubSite"  HeaderText = "子网站" />
-                         <f:BoundField Width = "100px" DataField = "Extend1"  HeaderText = "子网站" />
+                         <f:BoundField Width = "100px" DataField = "Extend1"  HeaderText = "子网站"  Hidden="true"/>
-                         <f:BoundField Width = "100px" DataField = "Extend2"  HeaderText = "子网站" />
+                         <f:BoundField Width = "100px" DataField = "Extend2"  HeaderText = "子网站"  Hidden="true"/>
-                         <f:BoundField Width = "100px" DataField = "Extend3"  HeaderText = "子网站" />
+                         <f:BoundField Width = "100px" DataField = "Extend3"  HeaderText = "子网站" Hidden="true" />
                      
                     </Columns>
                 </f:Grid>

SCP/Views/PlanData/SCP_PO.aspx

@@ -63,7 +63,8 @@
                                 <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
                                     <Items>
                                        <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo"   />
-                                          <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite"   Hidden="true"/>
+                                          <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName"  DataValueField=" ErpDomain">
+                                        </f:DropDownList>
                                           <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1"   Hidden="true" />
                                           <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2"   Hidden="true"/>
                                           <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3"   Hidden="true" />

SCP/Views/PlanData/SCP_PO.aspx.cs

@@ -48,7 +48,10 @@ namespace SCP.PlanData
            
         }
         public void SearchV_TB_PO(Action<IQueryable<V_TB_PO>> 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;

SCP/Views/PlanData/SCP_PO.aspx.designer.cs

@@ -150,13 +150,13 @@ namespace SCP.PlanData
         protected global::FineUI.TextBox TXT_BillNo;
 
         /// <summary>
-        /// TXT_SubSite 控件。
+        /// DropDownList1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox TXT_SubSite;
+        protected global::FineUI.DropDownList DropDownList1;
 
         /// <summary>
         /// TXT_Extend1 控件。

SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx

@@ -43,8 +43,8 @@
                         </f:FormRow>
                         <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
                             <Items>
-                               <f:DropDownList ID="DropDownList1" DataTextField="PORT_DESCRIPTION" DataValueField="PORT_NO" Required="false" runat="server" Label="地点">
+                               
-                                </f:DropDownList>
+                                 <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite"  Hidden="true" />
                                 <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1"  Hidden="true" />
                                  <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2"  Hidden="true" />
                                  <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3"  Hidden="true" />
@@ -158,7 +158,7 @@
                    </f:RenderField>
                        
                    <f:RenderField Width="100px" ColumnID="SubSite" DataField="SubSite" FieldType="String"
-                    HeaderText="地点" Hidden="false">
+                    HeaderText="子网站" Hidden="true">
                     <Editor>
                         <f:NumberBox ID="NumberBox2" runat="server"  MinValue="0"
                             MaxValue="99999999"    DecimalPrecision="3" >

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;

SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.designer.cs

@@ -105,13 +105,13 @@ namespace SCP.PlanData
         protected global::FineUI.TextBox TXT_VendId;
 
         /// <summary>
-        /// DropDownList1 控件。
+        /// TXT_SubSite 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.DropDownList DropDownList1;
+        protected global::FineUI.TextBox TXT_SubSite;
 
         /// <summary>
         /// TXT_Extend1 控件。

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();
         }
 

SCP/Views/PlanData/SCP_PO_EXTEND.aspx

@@ -52,8 +52,7 @@
                                 </f:Button>                            
                                 <f:ToolbarSeparator runat="server" />
                                  <f:Button ID="BTN_CREATE" runat="server"  EnablePostBack="True" Text="创建看板" Icon="Add" OnClick="BTN_CREATE_Click" >
-                                </f:Button>
+                                </f:Button>        
-                           
                                <f:Button ID="btnShow" runat="server" Text="显示查询面板" Icon="Find" OnClick="btnShow_Click">
                                 </f:Button>
                                  <f:Button ID="btnModeType1" runat="server" Text="日程单" Icon="Reload" OnClick="btnModeType1_Click" >
@@ -73,12 +72,14 @@
                                 <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
                                     <Items>
                                        <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo"   />
-                                         <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_SubSite"   />
+                                        <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName"  DataValueField=" ErpDomain">
-                                           <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend1"   />
+                                        </f:DropDownList>
-                                          <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend2"   />
+                                       <%--  <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_SubSite"   />--%>
-                                          <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend3"   />
+                                       <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend1" Hidden="true"  />
-                                       <f:TextBox runat = "server" Label = "供应商编码" EmptyText = "" ID = "TXT_Vendid"   />
+                                       <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend2"  Hidden="true"  />
-                                       <f:TextBox runat = "server" Label = "供应商名称" EmptyText = "" ID = "TXT_VendName"   />
+                                       <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend3"  Hidden="true"  />
+                                       <f:TextBox runat = "server" Label = "供应商编码" EmptyText = "" ID = "TXT_Vendid"    />
+                                       <f:TextBox runat = "server" Label = "供应商名称" EmptyText = "" ID = "TXT_VendName"  />
                                        <f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId"   />                                      
                                       </Items>
                                 </f:FormRow>                              

SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs

@@ -49,7 +49,11 @@ namespace SCP.PlanData
            
         }
         public void SearchV_TB_PO(Action<IQueryable<V_TB_PO>> 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)

SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs

@@ -132,13 +132,13 @@ namespace SCP.PlanData
         protected global::FineUI.TextBox TXT_BillNo;
 
         /// <summary>
-        /// TxT_SubSite 控件。
+        /// DropDownList1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox TxT_SubSite;
+        protected global::FineUI.DropDownList DropDownList1;
 
         /// <summary>
         /// TxT_Extend1 控件。

SCP/Views/SupplierData/SCP_ASK.aspx

@@ -57,7 +57,8 @@
                                 <f:FormRow runat="server" ID="FormRow_1">
                                     <Items>
                                        <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo"    />
-                                         <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite"   Hidden="true" />
+                                       <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName"  DataValueField=" ErpDomain">
+                                        </f:DropDownList>
                                          <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1"   Hidden="true" />
                                          <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2"   Hidden="true" />
                                          <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3"   Hidden="true" />

SCP/Views/SupplierData/SCP_ASK.aspx.cs

@@ -83,6 +83,9 @@ namespace SCP.Views.SupplierData
         }
         public void SearchV_TB_ASKData(Action<IQueryable<V_TB_ASK>> 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;

SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs

@@ -159,13 +159,13 @@ namespace SCP.Views.SupplierData
         protected global::FineUI.TextBox TXT_BillNo;
 
         /// <summary>
-        /// TXT_SubSite 控件。
+        /// DropDownList1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox TXT_SubSite;
+        protected global::FineUI.DropDownList DropDownList1;
 
         /// <summary>
         /// TXT_Extend1 控件。

SCP/Views/SupplierData/SCP_ASN.aspx

@@ -61,7 +61,8 @@
                                         <f:TextBox ID="TXT_VenderName" runat="server" Label="供应商"/>
                                         <f:TextBox ID="TXT_ASK" runat="server" Label="看板编号" />
                                         <f:TextBox ID="txtPO" runat="server" Label="订单编号" />
-                                        <f:TextBox ID="TXT_SubSite" runat="server" Label="子网站" Hidden="true"  />
+                                        <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName"  DataValueField=" ErpDomain">
+                                        </f:DropDownList>
                                         <f:TextBox ID="TXT_Extend1" runat="server" Label="子网站" Hidden="true" />
                                         <f:TextBox ID="TXT_Extend2" runat="server" Label="子网站" Hidden="true"  />
                                         <f:TextBox ID="TXT_Extend3" runat="server" Label="子网站" Hidden="true" />

SCP/Views/SupplierData/SCP_ASN.aspx.cs

@@ -60,6 +60,9 @@ namespace SCP.SupplierData
         }
         public void SearchV_TB_ASN(Action<IQueryable<V_TB_ASN>> 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;

SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs

@@ -186,13 +186,13 @@ namespace SCP.SupplierData
         protected global::FineUI.TextBox txtPO;
 
         /// <summary>
-        /// TXT_SubSite 控件。
+        /// DropDownList1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox TXT_SubSite;
+        protected global::FineUI.DropDownList DropDownList1;
 
         /// <summary>
         /// TXT_Extend1 控件。