From 01564b2e11446e8bfb7e3c803887315b5b84dea9 Mon Sep 17 00:00:00 2001
From: yejiaxing <591141169@qq.com>
Date: Fri, 17 Nov 2023 14:01:31 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/service/purchase/PurchaseMainServiceImpl.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java
index a38847cc..e081943c 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java
@@ -457,6 +457,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
 
     //更新采购订单已计划数量
     @Override
+    @Transactional
     public void updateOrderPurchasePlanQty(String poNumber, String poLine, String itemCode, BigDecimal planQty) {
         QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper();
         purchaseMainDOQueryWrapper.eq("number", poNumber);
@@ -488,6 +489,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
 
     //更新采购订单表的已收货数量
     @Override
+    @Transactional
     public void updateOrderPurchaseReceivedQty(String poNumber, String poLine, String itemCode, BigDecimal receivedQty) {
         QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper();
         purchaseMainDOQueryWrapper.eq("number", poNumber);
@@ -507,15 +509,15 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
                         res = true;
                     }
                 }
-                if ("DISCRETE".equals(purchaseMainDO.getType()) && res == true) {
+                if ("DISCRETE".equals(purchaseMainDO.getType()) && res) {
                     purchaseMainDO.setStatus(OrderStatusEnum.COMPLETED.getCode());
                 }
                 for (PurchaseDetailDO purchaseDetailDO : purchaseDetailDOList) {
                     //如果是离散单
                     if ("DISCRETE".equals(purchaseMainDO.getType())) {
-                        if (purchaseDetailDO.getReceivedQty() == purchaseDetailDO.getOrderQty()
+                        if (purchaseDetailDO.getReceivedQty() .compareTo(purchaseDetailDO.getOrderQty())==0
                                 || purchaseDetailDO.getReceivedQty().compareTo(purchaseDetailDO.getOrderQty().multiply(new BigDecimal(1).add(purchaseDetailDO.getOverReceivingPercent())))
-                                == 1) {
+                                >= 0) {
                             purchaseDetailDO.setAvailable("FALSE");
                         } else {
                             purchaseDetailDO.setReceivedQty(receivedQty);
@@ -537,6 +539,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
 
     //更新采购订单表的已发货数量
     @Override
+    @Transactional
     public void updateOrderPurchaseShippedQty(String poNumber, String poLine, String itemCode, BigDecimal shippedQty) {
         QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper();
         purchaseMainDOQueryWrapper.eq("number", poNumber);
@@ -567,6 +570,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
     }
     //更新采购订单表的已发货数量
     @Override
+    @Transactional
     public void updateOrderPurchaseReturnQty(String poNumber, String poLine, String itemCode, BigDecimal returnedQty) {
         QueryWrapper<PurchaseMainDO> purchaseMainDOQueryWrapper = new QueryWrapper();
         purchaseMainDOQueryWrapper.eq("number", poNumber);