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);
}
+ ///
+ /// 手动签收采购单
+ ///
+ ///
+ [HttpPost]
+ public void SignPurchaseOrder([FromBody]SignPurchaseOrderRequest request)
+ {
+ purchaseOrderBusiness.SignPurchaseOrder(request);
+ }
+
///
/// 1688回调
///
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().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(dbOrderPurchaseInfo.Id).Set(opi => opi.IsSign, true).ExecuteAffrows();
+ fsql.Update(dbOrder.Id).Set(o => o.IsWaitPack, true).ExecuteAffrows();
});
}