From 534711237bb35f2c85a800cef383e86922606835 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 13 Jul 2023 12:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E4=BB=A3=E5=85=A5=E4=BB=93?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PurchaseOrderController.cs       | 10 ++++++++++
 .../PurchaseOrder/PurchaseOrderBusiness.cs       | 16 ++++++++++++++++
 .../PurchaseOrder/PurchaserDeliveryRequest.cs    | 14 ++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 BBWYB.Server.Model/Dto/Request/PurchaseOrder/PurchaserDeliveryRequest.cs

diff --git a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs
index 2b4dd1a..21c07e0 100644
--- a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs
+++ b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs
@@ -112,6 +112,16 @@ namespace BBWYB.Server.API.Controllers
             purchaseOrderBusiness.ManualDelivery(request);
         }
 
+        /// <summary>
+        /// 厂商代发入仓发货
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void PurchaserDelivery([FromBody] PurchaserDeliveryRequest request)
+        {
+            purchaseOrderBusiness.PurchaserDelivery(request);
+        }
+
         /// <summary>
         /// 手动收货
         /// </summary>
diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 3c30438..8dba5c7 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -1481,6 +1481,22 @@ namespace BBWYB.Server.Business
             });
         }
 
+        /// <summary>
+        /// 厂家代入仓订单发货
+        /// </summary>
+        /// <param name="request"></param>
+        public void PurchaserDelivery(PurchaserDeliveryRequest request)
+        {
+            nLogManager.Default().Info($"ManualDelivery {JsonConvert.SerializeObject(request)}");
+
+            var dbOrder = fsql.Select<Order>(request.OrderId).ToOne();
+            if (dbOrder == null)
+                throw new BusinessException("订单不存在");
+            if (dbOrder.IntoStoreType != Enums.IntoStoreType.厂商代发入仓)
+                throw new BusinessException("此订单非厂商代发入仓");
+
+        }
+
         public void ManualSign(ManualSignRequest request)
         {
             Task.Factory.StartNew(() => OnExpressOrderChange(request.WayBillNo, "QianShou", DateTime.Now, "手动签收"),
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/PurchaserDeliveryRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/PurchaserDeliveryRequest.cs
new file mode 100644
index 0000000..6fa7545
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/PurchaserDeliveryRequest.cs
@@ -0,0 +1,14 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class PurchaserDeliveryRequest
+    {
+        public string OrderId { get; set; }
+
+        public IList<InStorePurchaseOrderManualDeliveryRequest> InStorePurchaseOrderManualDeliveryList { get; set; }
+    }
+
+    public class InStorePurchaseOrderManualDeliveryRequest: ManualDeliveryRequest
+    {
+        public IList<string> InStorePurchaseOrderIdList { get; set; }
+    }
+}