From 3017ea2af67e3beb0a260d9bed60d6ff99bd1944 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 4 Apr 2024 01:45:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleServiceImpl.java | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 4d8f1a3ed..fdd36d2fc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1625,17 +1625,30 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl 0){ - stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); + if ((loadingQuantity + deliveryQuantity) == 0){ + if (stockArticleEntity.getTotalNumber() == inWarehouseQuantity){ + stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue()); + }else if (inWarehouseQuantity > 0){ + stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue()); + } + }else { + if ((loadingQuantity + deliveryQuantity) == stockArticleEntity.getTotalNumber()) { + //无在库数量则无法进行预约 + stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); + }else if ((loadingQuantity + deliveryQuantity) > 0){ + stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); + } } - if (stockArticleEntity.getTotalNumber() == signingQuantity) { - stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); - } else if (stockArticleEntity.getTotalNumber() > signingQuantity) { - stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); + if (signingQuantity == 0){ + stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue()); + }else { + if (stockArticleEntity.getTotalNumber() == signingQuantity) { + stockArticleEntity.setOrderStatus(OrderStatusConstant.qianshou.getValue()); + } else if (stockArticleEntity.getTotalNumber() > signingQuantity) { + stockArticleEntity.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue()); + } } + //维护订单的在库件数 stockArticleEntity.setHandQuantity(inWarehouseQuantity); //维护订单的配送件数