diff --git a/B3QingDaoWanFu/B3QingDaoWanFu.csproj b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
index d6c3359..df8f8a4 100644
--- a/B3QingDaoWanFu/B3QingDaoWanFu.csproj
+++ b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
@@ -177,7 +177,6 @@
-
diff --git a/B3QingDaoWanFu/TypeIOCs/SaleForecastBLTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/SaleForecastBLTypeIoc.cs
deleted file mode 100644
index be407d7..0000000
--- a/B3QingDaoWanFu/TypeIOCs/SaleForecastBLTypeIoc.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using BWP.B3Frameworks;
-using BWP.B3Sale.BL;
-using Forks.EnterpriseServices.BusinessInterfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace BWP.B3QingDaoWanFu.TypeIOCs
-{
- [TypeIOC(typeof(SaleForecastBL), typeof(SaleForecastBL.BaseBLIOCs.AfterInsert))]
- public class SaleForecastBLTypeIoc : SaleForecastBL.BaseBLIOCs.AfterInsert
- {
- public void Invoke(Forks.EnterpriseServices.BusinessInterfaces.IDmoContext context, B3Sale.BO.SaleForecast dmo)
- {
- if (dmo.FromAppRpc)
- {
- var bl = BIFactory.Create(context);
- bl.Check(dmo);
- }
- }
- }
-}
diff --git a/B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs
index 9c57244..ccd4e20 100644
--- a/B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs
+++ b/B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs
@@ -24,6 +24,8 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
{
if (new WanFuOnlineConfig().AutoCombineOrder.Value == false)
return;
+ if (dmo.LoadTime == null)
+ throw new Exception("订单发货时间为空");
orderBL = BIFactory.Create(context);
var existInfo = GetExistOrderAndSaleOutStore(context.Session, dmo);
if (existInfo == null)
@@ -36,7 +38,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
var ok = CombineOrder(context.Session, dmo, existInfo.Item1, existInfo.Item2.HasValue);
if (!ok)
return;
-
+
if (existInfo.Item2.HasValue)
CombineSaleOutStore(context.Session, dmo, existInfo.Item2.Value);
@@ -65,9 +67,9 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
var first = comb.Details.FirstOrDefault(x => x.SaleGoods_ID == detail.SaleGoods_ID);
if (first == null)
{
- var nd = new Order_Detail();
- DmoUtil.CopyDmoFields(detail, nd, "ID", "Order_ID");
- comb.Details.Add(nd);
+ first = new Order_Detail();
+ DmoUtil.CopyDmoFields(detail, first, "ID", "Order_ID");
+ comb.Details.Add(first);
}
else
{
@@ -130,7 +132,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
}
else
{
- first.SecondNumber = (first.SecondNumber ?? 0).Value + (orderDetail.SecondNumber ?? 0);
+ first.SecondNumber = (first.SecondNumber ?? 0).Value + (orderDetail.SecondNumber ?? 0).Value;
first.UnitNum = (first.UnitNum ?? 0).Value + (orderDetail.UnitNum ?? 0).Value;
first.Number = (first.Number ?? 0).Value + (orderDetail.Number ?? 0).Value;
}