要货未完成查询

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;

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

SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx

@@ -52,14 +52,14 @@
                             </f:TextBox>
                             <f:TextBox runat="server" Label="零件名称" ID="TextPartName">
                             </f:TextBox>     
-                           <%--   <f:TextBox runat="server" Label="子网站" ID="SubSite">
+                              <f:TextBox runat="server" Label="子网站" ID="TextSubSite">
                             </f:TextBox>     
-                              <f:TextBox runat="server" Label="子网站" ID="Extend1">
+                              <f:TextBox runat="server" Label="子网站" ID="TextExtend1">
                             </f:TextBox>     
-                              <f:TextBox runat="server" Label="子网站" ID="Extend2">
+                              <f:TextBox runat="server" Label="子网站" ID="TextExtend2">
+                            </f:TextBox>     
+                              <f:TextBox runat="server" Label="子网站" ID="TextExtend3">
                             </f:TextBox>     
-                              <f:TextBox runat="server" Label="子网站" ID="Extend3">
-                            </f:TextBox>     --%>
                         </Items>
                     </f:FormRow>
                     <f:FormRow ColumnWidths="25% 25% 25% 25%" ID="FormRow_3"  runat="server">
@@ -91,7 +91,7 @@
                 </Rows>
             </f:Form>
         <f:Grid ID="GridINCOM" ShowBorder="true" ShowHeader="true" PageSize="100" BoxFlex="1" CssClass="maingrid"
-                    runat="server" DataKeyNames="PoBillNum,AskBillNum,PartCode,PartDesc1,PoLine,AskQty,Qty,Number,ValidityDays"
+                    runat="server" DataKeyNames="PoBillNum,AskBillNum,PartCode,PartDesc1,PoLine,AskQty,Qty,Number,ValidityDays,SubSite,Extend1,Extend2,Extend3"
                     IsDatabasePaging="true" AllowPaging="true" SortField="BeginTime" SortDirection="DESC"   OnPageIndexChange="Grid_V_TB_INCOMPLETE_ASK_PageIndexChange"
                          AutoScroll="True" EnableRowDoubleClickEvent="True" >  
                         <PageItems>
@@ -122,11 +122,11 @@
                         <f:BoundField Width = "100px" DataField = "ShipTime" DataFormatString = "{0:yyyy-MM-dd}" HeaderText = "最后发货日期" />
 
                         <f:BoundField Width = "100px" DataField = "ValidityDays"  HeaderText = "距到货日期（天）" />
-                       <%--  <f:BoundField Width = "100px" DataField = "SubSite"  HeaderText = "子网站" />
+                         <f:BoundField Width = "100px" DataField = "SubSite"  HeaderText = "子网站" />
                          <f:BoundField Width = "100px" DataField = "Extend1"  HeaderText = "子网站" />
                          <f:BoundField Width = "100px" DataField = "Extend2"  HeaderText = "子网站" />
                          <f:BoundField Width = "100px" DataField = "Extend3"  HeaderText = "子网站" />
-                     --%>
+                     
                     </Columns>
                 </f:Grid>
     </Items>

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(), "未完成订单明细");
                 }

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

@@ -185,6 +185,42 @@ namespace SCP.PlanData
         /// </remarks>
         protected global::FineUI.TextBox TextPartName;
 
+        /// <summary>
+        /// TextSubSite 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextSubSite;
+
+        /// <summary>
+        /// TextExtend1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextExtend1;
+
+        /// <summary>
+        /// TextExtend2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextExtend2;
+
+        /// <summary>
+        /// TextExtend3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextExtend3;
+
         /// <summary>
         /// FormRow_3 控件。
         /// </summary>