库存查询添加供应商查询条件/沈阳采购修改价格功能修改

Controller/SCP_WMS_CONTROLLER.cs

@@ -208,6 +208,10 @@ namespace CK.SCP.Controller
                     {
                         q = q.Where(p => p.PartCode.Contains(p_entity.PartCode));
                     }
+                    if (!string.IsNullOrEmpty(p_entity.VendId))
+                    {
+                        q = q.Where(p => p.VendId.Contains(p_entity.VendId));
+                    }
                     if (p_entity.UserInVendIds != null && p_entity.UserInVendIds.Count > 0)
                     {
                         q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId));
@@ -283,6 +287,10 @@ namespace CK.SCP.Controller
                     {
                         q = q.Where(p => p.PartCode.Contains(p_entity.PartCode));
                     }
+                    if (!string.IsNullOrEmpty(p_entity.VendId))
+                    {
+                        q = q.Where(p => p.VendId.Contains(p_entity.VendId));
+                    }
                     if (p_entity.UserInVendIds != null && p_entity.UserInVendIds.Count > 0)
                     {
                         q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId));

SCP/Views/SupplierData/SCP_STOCK.aspx

@@ -16,9 +16,9 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" runat="server">
                             <Items>
-                                <f:Label ID="Label2"  LabelWidth="60px" runat="server" Label="零件号">
+                                <f:TextBox ID="txtPartcode" runat="server" Label="零件号" Text="" LabelWidth="50px">
-                                </f:Label>
+                                </f:TextBox>
-                                <f:TextBox ID="txtPartcode" runat="server" Label="" Text="">
+                                    <f:TextBox ID="txtVendId" runat="server" Label="供应商编号" Text=""  LabelWidth="70px">
                                 </f:TextBox>
                                 <f:Button ID="btnSearch" runat="server" Text="查找" OnClick="btnSearch_Click" Icon="SystemSearch">
                                 </f:Button>

SCP/Views/SupplierData/SCP_STOCK.aspx.cs

@@ -37,6 +37,7 @@ namespace SCP.Views.SupplierData
         {
             VIEW_STOCK_VEND _entity = new VIEW_STOCK_VEND();
             _entity.PartCode = txtPartcode.Text;
+            _entity.VendId = txtVendId.Text;
             _entity.UserInVendIds = CurrentUser.VenderList;
             SCP_WMS_CONTROLLER.Get_VIEW_STOCK_DETAIL(_entity, (_ret) =>
             {

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

@@ -51,22 +51,22 @@ namespace SCP.Views.SupplierData
         protected global::FineUI.Toolbar Toolbar2;
 
         /// <summary>
-        /// Label2 控件。
+        /// txtPartcode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.Label Label2;
+        protected global::FineUI.TextBox txtPartcode;
 
         /// <summary>
-        /// txtPartcode 控件。
+        /// txtVendId 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.TextBox txtPartcode;
+        protected global::FineUI.TextBox txtVendId;
 
         /// <summary>
         /// btnSearch 控件。

SCP/Views/SupplierData/SCP_STOCK_DETAIL.aspx

@@ -16,16 +16,13 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" runat="server">
                             <Items>
-                                <f:Label ID="Label2"  LabelWidth="60px" runat="server" Label="零件号">
+                                <f:TextBox ID="txtPartcode" runat="server" Label="零件号" Text="" LabelWidth="50px">
-                                </f:Label>
+                                </f:TextBox>
-                                <f:TextBox ID="txtPartcode" runat="server" Label="" Text="">
+                                 <f:TextBox ID="txtVendId" runat="server" Label="供应商编号" Text="" LabelWidth="70px">
                                 </f:TextBox>
                                     <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
                                     </f:ToolbarSeparator>              
-                                    <f:Label ID="Label3" runat="server" Label="时间" >
+                                    <f:DatePicker ID="DatePicker1" runat="server" Label="时间" LabelWidth="50px">
-                                    </f:Label>
-                
-                                    <f:DatePicker ID="DatePicker1" runat="server" >
                                     </f:DatePicker>
                                     <f:Label ID="Label1" runat="server" Label="-" Text="-" ShowLabel="false">
                                     </f:Label>

SCP/Views/SupplierData/SCP_STOCK_DETAIL.aspx.cs

@@ -43,6 +43,7 @@ namespace SCP.Views.SupplierData
         {
             VIEW_STOCK_QTY _entity = new VIEW_STOCK_QTY();
             _entity.PartCode = txtPartcode.Text;
+            _entity.VendId = txtVendId.Text;
             _entity.UserInVendIds = CurrentUser.VenderList;
             if (DatePicker1.SelectedDate != null)
             {

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

@@ -50,15 +50,6 @@ namespace SCP.Views.SupplierData
         /// </remarks>
         protected global::FineUI.Toolbar Toolbar2;
 
-        /// <summary>
-        /// Label2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Label Label2;
-
         /// <summary>
         /// txtPartcode 控件。
         /// </summary>
@@ -69,22 +60,22 @@ namespace SCP.Views.SupplierData
         protected global::FineUI.TextBox txtPartcode;
 
         /// <summary>
-        /// ToolbarSeparator2 控件。
+        /// txtVendId 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.ToolbarSeparator ToolbarSeparator2;
+        protected global::FineUI.TextBox txtVendId;
 
         /// <summary>
-        /// Label3 控件。
+        /// ToolbarSeparator2 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.Label Label3;
+        protected global::FineUI.ToolbarSeparator ToolbarSeparator2;
 
         /// <summary>
         /// DatePicker1 控件。

SCP/Views/沈阳金杯/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs

@@ -44,6 +44,16 @@ namespace SCP.Views.沈阳金杯.WarehouseData
         private void SetRoleRule()
         {
             IsPriceVisible(Grid1, "要货日期");
+            if (CurrentUser.RoleList.Contains("修改价格"))
+            {
+                for (int i = 0, count = Grid1.Rows.Count; i < count; i++)
+                {
+                    object[] rowDataKeys = Grid1.DataKeys[i];
+                    GridRow row = Grid1.Rows[i];
+                    var txtPrice = (System.Web.UI.WebControls.TextBox)row.FindControl("txtPrice");
+                    txtPrice.Enabled = true;
+                }
+            }
         }
         private void GetInvoice()
         {
@@ -84,16 +94,7 @@ namespace SCP.Views.沈阳金杯.WarehouseData
                             this.btnCheckSuccess.Hidden = true; //Visible = false;
                         }
                     }
-                    if (CurrentUser.RoleList.Contains("修改价格"))
+
-                    {
-                        for (int i = 0, count = Grid1.Rows.Count; i < count; i++)
-                        {
-                            object[] rowDataKeys = Grid1.DataKeys[i];
-                            GridRow row = Grid1.Rows[i];
-                            var txtPrice = (System.Web.UI.WebControls.TextBox)row.FindControl("txtPrice");
-                            txtPrice.Enabled = true;
-                        }
-                    }
                 }
             });
             this.btnEdit.Enabled = true;
@@ -270,16 +271,19 @@ namespace SCP.Views.沈阳金杯.WarehouseData
         {
             Grid1.PageSize = Convert.ToInt32(ddlGridPageSize.SelectedValue);
             BindData();
+            SetRoleRule();
         }
         protected void Grid_V_TB_INVOICE_DETAIL_PageIndexChange(object sender, FineUI.GridPageEventArgs e)
         {
             BindData();
+            SetRoleRule();
         }
         protected void Grid1_Sort(object sender, GridSortEventArgs e)
         {
             Grid1.SortDirection = e.SortDirection;
             Grid1.SortField = e.SortField;
             BindData();
+            SetRoleRule();
         }
         protected void Window1_Close(object sender, WindowCloseEventArgs e)
         {

SCP/default.aspx

@@ -111,10 +111,10 @@
 
         for (var i = 0; obj.options.length; i++)
         {
-            if ('QDVALEO' == obj.options[i].value) {
+            if ('JZ1' == obj.options[i].value) {
                 obj.options[i].selected = true;
                 _factory = document.getElementById(_factoryValue);
-                _factory.value = 'QDVALEO';
+                _factory.value = 'JZ1';
             }
         }
     }