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);
}
+ ///
+ /// 厂商代发入仓发货
+ ///
+ ///
+ [HttpPost]
+ public void PurchaserDelivery([FromBody] PurchaserDeliveryRequest request)
+ {
+ purchaseOrderBusiness.PurchaserDelivery(request);
+ }
+
///
/// 手动收货
///
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
});
}
+ ///
+ /// 厂家代入仓订单发货
+ ///
+ ///
+ public void PurchaserDelivery(PurchaserDeliveryRequest request)
+ {
+ nLogManager.Default().Info($"ManualDelivery {JsonConvert.SerializeObject(request)}");
+
+ var dbOrder = fsql.Select(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 InStorePurchaseOrderManualDeliveryList { get; set; }
+ }
+
+ public class InStorePurchaseOrderManualDeliveryRequest: ManualDeliveryRequest
+ {
+ public IList InStorePurchaseOrderIdList { get; set; }
+ }
+}