diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 553a794..3cf65c8 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -410,7 +410,8 @@ namespace BBWYB.Server.Business insertOrderCost?.ExecuteAffrows(); if (updatePurchaseTimeSchemeIdList.Count() > 0) fsql.Update(updatePurchaseTimeSchemeIdList).Set(p => p.LastPurchaseTime, DateTime.Now).ExecuteAffrows(); - fsql.Update(request.OrderId).SetIf(dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Model.Enums.OrderState.待出库) + fsql.Update(request.OrderId).SetIf(dbOrder.OrderState == Enums.OrderState.待付款 || + dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Model.Enums.OrderState.待出库) .SetIf(!string.IsNullOrEmpty(request.Remark), o => o.PurchaseRemark, request.Remark) .Set(o => o.IsPurchased, true) .Set(o => o.PackConfigState, Enums.PackConfigState.待配置) @@ -651,7 +652,8 @@ namespace BBWYB.Server.Business insertOrderCost?.ExecuteAffrows(); updateOrderCost?.ExecuteAffrows(); - fsql.Update(dbOrder.Id).SetIf(dbOrder.OrderState == Enums.OrderState.待付款, o => o.OrderState, Enums.OrderState.待出库) + fsql.Update(dbOrder.Id).SetIf(dbOrder.OrderState == Enums.OrderState.待付款 || + dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Enums.OrderState.待出库) .Set(o => o.IsPurchased, true) .ExecuteAffrows(); });