diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index ba2a5f8..ef5a226 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -1103,7 +1103,8 @@ namespace BBWYB.Server.Business if (deleteWaybillNoList.Count() > 0) fsql.Delete(deleteWaybillNoList).ExecuteAffrows(); - //fsql.Delete().Where(peo => peo.PurchaseOrderId == request.PurchaseOrderId).ExecuteAffrows(); + fsql.Delete().Where(i => i.OrderId == request.OrderId && i.PurchaseOrderId == request.PurchaseOrderId) + .ExecuteAffrows(); fsql.Update().SetSource(dbOrderCost).ExecuteAffrows(); fsql.Update(dbOrder.Id).Set(o => o.OrderState, dbOrder.OrderState).ExecuteAffrows(); @@ -1496,6 +1497,12 @@ namespace BBWYB.Server.Business throw new BusinessException("订单不存在"); if (dbOrder.IntoStoreType != Enums.IntoStoreType.厂商代发入仓) throw new BusinessException("此订单非厂商代发入仓"); + if (request.InStorePurchaseOrderManualDeliveryList.Count() == 0) + throw new BusinessException("缺少快递信息"); + if (request.InStorePurchaseOrderManualDeliveryList.Any(x => x.InStorePurchaseOrderIdList.Count() == 0)) + throw new BusinessException("缺少入仓采购单信息"); + if (request.InStorePurchaseOrderManualDeliveryList.Any(x => x.InStorePurchaseOrderIdList.Count() != x.InStorePurchaseOrderIdList.Distinct().Count())) + throw new BusinessException("同一个快递单下不允许出现重复的入仓采购单"); List insertPurchaseExpressOrderList = new List(); List insertExpressOrderRelationList = new List();