From 041207b318bca8a50ba57c1ad83406503a8f6aad Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 31 May 2023 08:35:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=8B=E5=8A=A8=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E9=87=87=E8=B4=AD=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PurchaseOrderController.cs             | 10 ++++++++++
 BBWYB.Server.Business/Order/OrderBusiness.cs           |  1 +
 .../PurchaseOrder/PurchaseOrderBusiness.cs             |  5 ++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs
index 56829c6..86a9171 100644
--- a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs
+++ b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs
@@ -68,6 +68,16 @@ namespace BBWYB.Server.API.Controllers
             purchaseOrderBusiness.SetHistoryPurchaseOrder(request);
         }
 
+        /// <summary>
+        /// 手动签收采购单
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void SignPurchaseOrder([FromBody]SignPurchaseOrderRequest request)
+        {
+            purchaseOrderBusiness.SignPurchaseOrder(request);
+        }
+
         /// <summary>
         /// 1688回调
         /// </summary>
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 1adc817..5f11a43 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -99,6 +99,7 @@ namespace BBWYB.Server.Business
                 IsPurchased = o.IsPurchased,
                 BuyerAccount = o.BuyerAccount,
                 InPackAmount = o.InPackAmount,
+                IsWaitPack = o.IsWaitPack,
 
                 ContactName = ocs.ContactName,
                 Address = ocs.Address,
diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 511c951..553a794 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -706,6 +706,8 @@ namespace BBWYB.Server.Business
                 throw new BusinessException("无效订单号");
             if (dbOrder.OrderState == Enums.OrderState.已取消)
                 throw new BusinessException("订单已取消");
+            if (dbOrder.OrderState == Enums.OrderState.已完成)
+                throw new BusinessException("订单已完成无需签收");
 
             var dbOrderPurchaseInfo = fsql.Select<OrderPurchaseInfo>().Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId && opi.IsEnabled == true).ToOne();
             if (dbOrderPurchaseInfo == null)
@@ -717,7 +719,8 @@ namespace BBWYB.Server.Business
 
             fsql.Transaction(() =>
             {
-
+                fsql.Update<OrderPurchaseInfo>(dbOrderPurchaseInfo.Id).Set(opi => opi.IsSign, true).ExecuteAffrows();
+                fsql.Update<Order>(dbOrder.Id).Set(o => o.IsWaitPack, true).ExecuteAffrows();
             });
         }