From de565c034ea80c9dff92539b1682eabe43d33ed6 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 13 Jul 2023 18:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E7=BD=AE=E5=BF=AB?=
 =?UTF-8?q?=E9=80=92=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8E=86=E5=8F=B2=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrder/PurchaseOrderBusiness.cs               | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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<PurchaseExpressOrder>(deleteWaybillNoList).ExecuteAffrows();
 
-                //fsql.Delete<PurchaseExpressOrder>().Where(peo => peo.PurchaseOrderId == request.PurchaseOrderId).ExecuteAffrows();
+                fsql.Delete<InStorePurchaseOrdeRrelationInfo>().Where(i => i.OrderId == request.OrderId && i.PurchaseOrderId == request.PurchaseOrderId)
+                                                               .ExecuteAffrows();
 
                 fsql.Update<OrderCost>().SetSource(dbOrderCost).ExecuteAffrows();
                 fsql.Update<Order>(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<PurchaseExpressOrder> insertPurchaseExpressOrderList = new List<PurchaseExpressOrder>();
             List<ExpressOrderRelationInfo> insertExpressOrderRelationList = new List<ExpressOrderRelationInfo>();