修改万福销售单 详见需求单 140443

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs

@@ -114,11 +114,11 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       layout.Add("DeliverGoodsLine_ID", mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(deliverLineInput = QueryCreator.DFChoiceBoxEnableMultiSelection(_mainInfo.Fields["DeliverGoodsLine_ID"], B3SaleDataSources.送货线路), s => long.Parse(s)), "DeliverGoodsLine_ID"));
 
       layout["DeliverGoodsLine_ID"].NotAutoAddToContainer = true;
-      layout.Add("LoadTime", QueryCreator.TimeRange(_mainInfo.Fields["LoadTime"], mQueryContainer, "MinLoadTime", "MaxLoadTime"));
+      layout.Add("LoadTime", QueryCreator.TimeRange(_mainInfo.Fields["LoadTime"], mQueryContainer, "MinLoadTime", "MaxLoadTime",DateTime.Today, DateTime.Today.AddDays(1).AddSeconds(-1)));
 
       var state = mQueryContainer.Add(billStateInput = QueryCreator.一般单据状态(_mainInfo.Fields["BillState"], true, false, true, true), "BillState");
-      ((ChoiceBox)state).Value = 单据状态.未审核.Value.ToString() + "|";
-      state.DisplayValue = "未审核;";
+      ((ChoiceBox)state).Value = 单据状态.已审核.Value.ToString() + "|";
+      state.DisplayValue = "已审核;";
       state.EnableInputArgument = true;
       layout.Add("BillState", state);
 
@@ -156,7 +156,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       vPanel.Add(layout.CreateLayout(), new VLayoutOption(HorizontalAlign.Left));
     }
 
-    private Dictionary<string, string> fieldInfo = new Dictionary<string, string>() { {"Customer_Name", "购货客户" }, { "Goods_Name", "存货名称" },{ "Goods_Spec", "存货规格" }, { "Order_Detail_UnitNum", "订单数量" }, { "SecondNumber", "辅数量" }, { "Goods_SecondUnit", "辅单位" } };
+    private Dictionary<string, string> fieldInfo = new Dictionary<string, string>() { {"Customer_Name", "购货客户" }, { "DeliverGoodsLine_Name", "送货线路名称" }, { "Goods_Name", "存货名称" },{ "Goods_Spec", "存货规格" }, { "Order_Detail_UnitNum", "订单数量" }, { "SecondNumber", "辅数量" }, { "Goods_SecondUnit", "辅单位" } };
 
 
     protected override void PrepareData()
@@ -166,7 +166,8 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       var minLoad = mQueryContainer.GetControl<DFDateTimeInput>("MinLoadTime");
       var maxOrder = mQueryContainer.GetControl<DFDateTimeInput>("MaxOrderDate");
       var minOrder = mQueryContainer.GetControl<DFDateTimeInput>("MinOrderDate");
-
+      var customer = mQueryContainer.GetControl<DFChoiceBox>("Customer_ID");
+      var take = mQueryContainer.GetControl<DFNamedValueInput<配送方式>>("TakeGoods_Type");
       var info = new SaleOutStorePrintInfo();
       if (!maxLoad.IsEmpty)
       {
@@ -187,8 +188,20 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       {
         info.MinOrderDate = minOrder.Date;
       }
+      if(!customer.IsEmpty)
+      {
+        info.Customers = customer.Value;
+      }
+      if(!take.IsEmpty)
+      {
+        info.TakeGoodsTypes = string.Join("|", take.GetValues().Select(x => x.Value));
+      }
+      
       info.BillStates = string.Join("|", billStateInput.GetValues().Select(x => x.Value));
       info.DeliverGoodsLines = deliverLineInput.Value;
+      info.GoodsPropertyCatalogs = _goodsPropertyCatalog.Value;
+      info.GoodsPropertyCatalogDisplayValue = _goodsPropertyCatalog.DisplayValue;
+
       info.Save();
       printAction.Url = "SaleOutStoreSimpleAnaysePrint.aspx";
       previewAction.Url = "SaleOutStoreSimpleAnaysePrint.aspx";
@@ -230,6 +243,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
         switch (item.Key)
         {
           case "Customer_Name":
+          case "DeliverGoodsLine_Name":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(root, item.Key), item.Value));
             dom.GroupBy.Expressions.Add(DQExpression.Field(root, item.Key));
             break;

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs

@@ -23,6 +23,8 @@ using BWP.B3Sale.BO;
 using BWP.B3Frameworks;
 using BWP.B3Frameworks.Utils;
 using System;
+using BWP.B3UnitedInfos.BO;
+using BWP.Web.Utils;
 
 namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
 {
@@ -119,6 +121,8 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
             int i = 0;
             var item = new SaleOutStoreSimpleAnayseBo();
             item.Customer_Name = (string)reader[i++];
+            item.DeliverGoodsLine_Name = (string)reader[i++];
+            
             item.Goods_Name = (string)reader[i++];
             item.Goods_Spec = (string)reader[i++];
             item.OrderNumber = (Money<decimal>?)reader[i++];
@@ -135,60 +139,13 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       return list;
     }
 
-    #region
-    private string GetHtml()
-    {
-      var sb = new StringBuilder();
-
-      sb.Append("<tr>");
-      sb.Append("<td >存货名称</td>");
-      sb.Append("<td > 计划号</td>");
-      sb.Append("<td >计数规格</td>");
-      sb.Append("<td >盘数</td>");
-      sb.Append("<td >袋数</td>");
-      sb.Append("<td >重量</td>");
-      sb.Append("<td >包装模式</td>");
-      sb.Append("</tr>");
-
-
-      var query = GetQueryDom();
-      using (var context = new TransactionContext())
-      {
-        using (var reader = context.Session.ExecuteReader(query))
-        {
-
-          while (reader.Read())
-          {
-            int i = 0;
-            sb.Append("<tr>");
-            sb.Append(string.Format("<td >{0}</td>", reader[i++]));
-            sb.Append(string.Format("<td >{0}</td>", reader[i++]));
-            sb.Append(string.Format("<td >{0}</td>", reader[i++]));
-            sb.Append(string.Format("<td >{0}</td>", reader[i++]));
-            sb.Append(string.Format("<td >{0}</td>", reader[i++]));
-            sb.Append(string.Format("<td >{0}</td>", reader[i++]));
-            sb.Append(string.Format("<td >{0}</td>", reader[i++]));
-            sb.Append("</tr>");
-          }
-        }
-
-
-      }
-
-
-
-
 
-      return sb.ToString();
-    }
-
-    #endregion
     public SaleOutStorePrintInfo info  { get; set; }
     
 
 
 
-    private string[] fieldInfo = new string[] { "Customer_Name", "Goods_Name", "Goods_Spec", "Order_Detail_UnitNum", "SecondNumber", "Goods_SecondUnit" };
+    private string[] fieldInfo = new string[] { "Customer_Name",  "DeliverGoodsLine_Name","Goods_Name", "Goods_Spec", "Order_Detail_UnitNum", "SecondNumber", "Goods_SecondUnit" };
     
     private DQueryDom GetQueryDom()
     {
@@ -196,12 +153,25 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       var root = new JoinAlias("__main", typeof(SaleOutStore));
       var detail = new JoinAlias("__detail", typeof(SaleOutStore_Detail));
       var dom = new DQueryDom(root);
+
+      var goods = new JoinAlias(typeof(SaleGoods));
+      var goodsProperty = new JoinAlias(typeof(GoodsProperty));
+      var goodsPropertyCatalog = new JoinAlias(typeof(GoodsPropertyCatalog));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(root, "ID", detail, "SaleOutStore_ID"));
+
+      dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(detail, "SaleGoods_ID", goods, "ID"));
+      dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", goods, "GoodsProperty_ID"));
+      dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsPropertyCatalog), DQCondition.EQ(goodsProperty, "GoodsPropertyCatalog_ID", goodsPropertyCatalog, "ID"));
+      dom.Where.Conditions.Add(DQCondition.EQ(root, "Domain_ID", DomainContext.Current.ID));
+      OrganizationUtil.AddOrganizationLimit(dom, typeof(SaleOutStore));
+
+
       foreach (var item in fieldInfo)
       {
         switch (item)
         {
           case "Customer_Name":
+          case "DeliverGoodsLine_Name":
             dom.Columns.Add(DQSelectColumn.Field(item, root));
             dom.GroupBy.Expressions.Add(DQExpression.Field(root, item));
             break;
@@ -246,6 +216,33 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
         {
           dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(root, "DeliverGoodsLine_ID"), info.DeliverGoodsLines.Split('|').Select(x => DQExpression.Value(x)).ToArray()));
         }
+
+        if (!string.IsNullOrEmpty(info.GoodsPropertyCatalogs))
+        {
+          var strs = B3SaleWebUtil.GetDeepByTreeName(info.GoodsPropertyCatalogDisplayValue);
+          var conditions = new List<IDQExpression>();
+          var values = info.GoodsPropertyCatalogs.Split('|');
+          for (int index = 0; index < values.Length; index++)
+          {
+            var value = values[index];
+            if (string.IsNullOrEmpty(value))
+              continue;
+            conditions.Add(DQCondition.EQ(goodsPropertyCatalog, "TreeDeep" + strs[index] + "ID", value));
+          }
+          dom.Where.Conditions.Add(DQCondition.Or(conditions));
+
+
+        }
+        if (!string.IsNullOrEmpty(info.Customers))
+        {
+          dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(root, "Customer_ID"), info.Customers.Split('|').Select(x => DQExpression.Value(x)).ToArray()));
+        }
+        if (!string.IsNullOrEmpty(info.TakeGoodsTypes))
+        {
+          dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(root, "TakeGoods_Type"), info.TakeGoodsTypes.Split('|').Select(x => DQExpression.Value(x)).ToArray()));
+        }
+
+
       }
       dom.Where.Conditions.Add(DQCondition.EQ(root, "Domain_ID", DomainContext.Current.ID));
       OrganizationUtil.AddOrganizationLimit(dom, typeof(SaleOutStore));

B3QingDaoWanFu/BO/SaleOutStorePrint/SaleOutStorePrintInfo.cs

@@ -35,10 +35,10 @@ namespace BWP.B3QingDaoWanFu.BO
 
     public string DeliverGoodsLines { get; set; }
     public string BillStates { get; set; }
-
-
-
-
+    public string GoodsPropertyCatalogDisplayValue { get; set; }
+    public string GoodsPropertyCatalogs { get; set; }
+    public string Customers { get; set; }
+    public string TakeGoodsTypes { get; set; }
 
     private static string CreateCacheKey(Type type)
     {

B3QingDaoWanFu/BO/SaleOutStorePrint/SaleOutStoreSimpleAnayse.cs

@@ -24,8 +24,9 @@ namespace BWP.B3QingDaoWanFu.BO
 
     [LogicName("购货客户")]
     public string Customer_Name { get; set; }
-
-
+    [LogicName("送货线路名称")]
+    public string DeliverGoodsLine_Name { get; set; }
+    
     [LogicName("订单数量")]
     public Money<decimal>? OrderNumber { get; set; }
     [LogicName("辅数量")]