From efccf8f98c97e26634a27059d6370b35d6d72caa Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Wed, 31 May 2023 01:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E7=AD=BE=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrder/PurchaseOrderBusiness.cs | 30 +++++++++++++++++++ BBWYB.Server.Model/Db/Order/Order.cs | 5 ++++ .../Db/Order/OrderPurchaseInfo.cs | 6 ++++ .../PurchaseOrder/SignPurchaseOrderRequest.cs | 12 ++++++++ 4 files changed, 53 insertions(+) create mode 100644 BBWYB.Server.Model/Dto/Request/PurchaseOrder/SignPurchaseOrderRequest.cs diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 5ddd67c..511c951 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -657,6 +657,10 @@ namespace BBWYB.Server.Business }); } + /// + /// 设置历史采购单 + /// + /// public void SetHistoryPurchaseOrder(SetHistoryPurchaseOrderRequest request) { var dbOrderCostDetailList = fsql.Select().Where(ocd => ocd.OrderId == request.OrderId).ToList(); @@ -691,6 +695,32 @@ namespace BBWYB.Server.Business }); } + /// + /// 签收采购单 + /// + /// + public void SignPurchaseOrder(SignPurchaseOrderRequest request) + { + var dbOrder = fsql.Select(request.OrderId).ToOne(); + if (dbOrder == null) + 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) + throw new BusinessException("无效采购单号"); + if (!dbOrderPurchaseInfo.IsEnabled) + throw new BusinessException("采购单已失效"); + if (dbOrderPurchaseInfo.IsSign == true) + throw new BusinessException("采购单已签收"); + + fsql.Transaction(() => + { + + }); + } + #region 1688CallBack public void CallbackFrom1688(string jsonStr) { diff --git a/BBWYB.Server.Model/Db/Order/Order.cs b/BBWYB.Server.Model/Db/Order/Order.cs index 2e2dfe8..aeb304a 100644 --- a/BBWYB.Server.Model/Db/Order/Order.cs +++ b/BBWYB.Server.Model/Db/Order/Order.cs @@ -231,6 +231,11 @@ namespace BBWYB.Server.Model.Db [Column(DbType = "int(1)", MapType = typeof(int?))] public PackConfigState? PackConfigState { get; set; } + /// + /// 是否为待打包 + /// + [Column(DbType = "bit")] + public bool? IsWaitPack { get; set; } = false; } } diff --git a/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs b/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs index 7c6be1e..31b7048 100644 --- a/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs +++ b/BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs @@ -100,6 +100,12 @@ namespace BBWYB.Server.Model.Db /// [Column(StringLength = 500)] public string Remark { get; set; } + + /// + /// Ƿǩ + /// + [Column(DbType = "bit")] + public bool? IsSign { get; set; } = false; } } diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseOrder/SignPurchaseOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/SignPurchaseOrderRequest.cs new file mode 100644 index 0000000..4a678e4 --- /dev/null +++ b/BBWYB.Server.Model/Dto/Request/PurchaseOrder/SignPurchaseOrderRequest.cs @@ -0,0 +1,12 @@ +namespace BBWYB.Server.Model.Dto +{ + public class SignPurchaseOrderRequest + { + public string OrderId { get; set; } + + /// + /// 采购单Id + /// + public string PurchaseOrderId { get; set; } + } +}