From 36d2dd0170c407db582696ce8b8751aa5361242f Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Thu, 1 Feb 2018 17:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4=E5=8D=95No?=
 =?UTF-8?q?.45617=20=E3=80=81=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4=E5=8D=95?=
 =?UTF-8?q?No.45629=E3=80=81=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4=E5=8D=95N?=
 =?UTF-8?q?o.45620?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs    |  2 ++
 .../Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs  | 10 +++++++---
 BWP.B3_YunKen.Web/PluginClass.cs                       |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
index e463272..a4647b3 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
@@ -33,6 +33,8 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
 
       //需求单No.137672 【销售出库】‘基本属性’增加字段｛承运方｝
       config.Add("Carrier_ID");
+      layoutManager.Add("Code", new DFValueLabel());
+      config.Add("Code");
     }
 
     public override void AppToUI()
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs
index 6d7148e..62482b3 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ProduceFinishDiffReport.cs
@@ -73,6 +73,9 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       query.Columns.Add(DQSelectColumn.Field("GoodsBatch_ID", detail));
       query.Where.Conditions.Add(DQCondition.Or(DQCondition.EQ("BillState", 单据状态.已审核), DQCondition.EQ("BillState", 单据状态.已完毕)));
       query.Where.Conditions.Add(DQCondition.EQ("Domain_ID",DomainContext.Current.ID));
+      if (!_productionUnit.IsEmpty) {
+        query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(inStore, "ProductionUnit_ID"), _productionUnit.GetValues().Select(x => DQExpression.Value(x)).ToArray()));
+      }
       query.GroupBy.Expressions.Add(DQExpression.Snippet("convert(varchar(100),InStoreDate,23)"));
       query.GroupBy.Expressions.Add(DQExpression.Field(detail, "Goods_ID"));
       query.GroupBy.Expressions.Add(DQExpression.Field(detail, "BrandItem_ID"));
@@ -109,6 +112,9 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_ID", detail));
       dom.Where.Conditions.Add(DQCondition.Or(DQCondition.EQ("BillState", 单据状态.已审核), DQCondition.EQ("BillState", 单据状态.已完毕)));
       dom.Where.Conditions.Add(DQCondition.EQ("Domain_ID", DomainContext.Current.ID));
+      if (!_productionUnit.IsEmpty) {
+        dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(bill, "ProductionUnit_ID"), _productionUnit.GetValues().Select(x => DQExpression.Value(x)).ToArray()));
+      }
       dom.GroupBy.Expressions.Add(DQExpression.Snippet("convert(varchar(100),Date,23)"));
       dom.GroupBy.Expressions.Add(DQExpression.Field(detail, "Goods_ID"));
       dom.GroupBy.Expressions.Add(DQExpression.Field(detail, "BrandItem_ID"));
@@ -244,9 +250,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       if (!_productLine.IsEmpty) {
         query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(goods1, "ProductLine_ID"), _productLine.GetValues().Select(x => DQExpression.Value(x)).ToArray()));
       }
-      if (!_productionUnit.IsEmpty) {
-        query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(finishData, "ProductionUnit_ID"), _productionUnit.GetValues().Select(x => DQExpression.Value(x)).ToArray()));
-      }
+      
       return query;
     }
 
diff --git a/BWP.B3_YunKen.Web/PluginClass.cs b/BWP.B3_YunKen.Web/PluginClass.cs
index 58eb8e7..6b1db2b 100644
--- a/BWP.B3_YunKen.Web/PluginClass.cs
+++ b/BWP.B3_YunKen.Web/PluginClass.cs
@@ -38,6 +38,7 @@ namespace BWP.B3_YunKen.Web
       GlobalFlags.On(B3SaleConsts.Flags.PriceBillNotCodeRemark);
       GlobalFlags.On(B3SaleConsts.Flags.OpenReturnInStoreSelectOutStore);
       GlobalFlags.On(B3SaleConsts.Flags.OpenReturnInStoreUnCheckNotDeleteAccpet);
+      GlobalFlags.On(B3SaleConsts.Flags.UseCustomerAcceptDate);
       WpfPageFactory.RegisterPageOverlay(typeof(OrderEdit).FullName, typeof(OrderEdit_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(SaleOutStoreEdit).FullName, typeof(SaleOutStoreEdit_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(SaleForecastEdit).FullName, typeof(SaleForecastEdit_Ext).FullName);