1

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -1088,8 +1088,7 @@ namespace BBWYB.Server.Business
         {
             nLogManager.Default().Info($"EditPurchaseExpressOrder {JsonConvert.SerializeObject(request)}");
 
-            throw new BusinessException("修改快递单已暂时下线,待调整后重新上线");
-
+          
             var dbOrder = fsql.Select<Order>(request.OrderId).ToOne(o => new { o.Id, o.ShopId, o.OrderSn });
             if (dbOrder == null)
                 throw new BusinessException($"订单号{request.OrderId}不存在");
@@ -1100,11 +1099,14 @@ namespace BBWYB.Server.Business
             var oldPeo = fsql.Select<PurchaseExpressOrder>(request.OldWaybillNo).ToOne();
             if (oldPeo == null)
                 throw new BusinessException($"旧快递单号{request.OldWaybillNo}不存在");
-            //if (oldPeo.OrderId != request.OrderId || oldPeo.PurchaseOrderId != request.PurchaseOrderId)
-            //    throw new BusinessException("快递单号不属于当前操作提交的订单或采购单");
+
             var newPeo = fsql.Select<PurchaseExpressOrder>(request.NewWaybillNo).ToOne();
-            if (newPeo != null)
-                throw new BusinessException($"新快递单号{request.NewWaybillNo}已存在");
+            if (newPeo != null && newPeo.PurchaseOrderId == request.PurchaseOrderId)
+                throw new BusinessException("不能为同一采购单设置重复的快递单号");
+
+            IInsert<PurchaseExpressOrder> insertPEO = null;
+            IInsert<ExpressOrderRelationInfo> insertEORI = null;
+
 
             newPeo = new PurchaseExpressOrder()
             {