错误提交单No.45617 、错误提交单No.45629、错误提交单No.45620

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

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

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