From 7839465aac0d73d80af8346367d8cc5ee01ea90f Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 30 Sep 2024 11:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=89=A3=E5=87=8F=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inout/IoCodeTempController.java     |  7 +++++--
 .../glxp/api/service/inout/IoSplitFifoInvService.java  |  3 ++-
 .../java/com/glxp/api/util/udi/UdiCalCountUtil.java    | 10 ++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index a6941b15a..124c97b67 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1968,9 +1968,12 @@ public class IoCodeTempController extends BaseController {
             return ResultVOUtils.error(506, "UDI码异常，未录入！");
         }
         IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+        UdiRelevanceResponse udiRelevanceResponses = udiRelevanceService.selectByNameCode(codeTempEntity.getNameCode());
+
         if (codeTempEntity.getMyCount() > 1) {
             codeTempEntity.setCount(codeTempEntity.getMyCount() - 1);
-            codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+            codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getActCount(bussinessTypeEntity, udiRelevanceResponses));
             codeTempService.updateById(codeTempEntity);
         } else {
             codeTempService.deleteById(id);
@@ -1984,7 +1987,7 @@ public class IoCodeTempController extends BaseController {
             int orderReCount = IntUtil.value(orderDetailCodeEntity.getReCount());
             if (orderCount > 1) {
                 orderDetailCodeEntity.setCount(orderCount - 1);
-                orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+                orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(bussinessTypeEntity, udiRelevanceResponses));
                 ioOrderDetailCodeService.update(orderDetailCodeEntity);
             } else {
                 ioOrderDetailCodeService.deleteById(orderDetailCodeEntity.getId());
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
index 9a8940a28..6dab439fb 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -161,7 +161,8 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                         splitFifoCodeService.updateById(ioSplitFifoCodeEntity);
                     }
                 } else {
-                    splitCodeEntities.add(ioSplitFifoCodeEntity);
+                    if (ioSplitFifoCodeEntity != null)
+                        splitCodeEntities.add(ioSplitFifoCodeEntity);
                 }
             }
         }
diff --git a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java
index 30283a1cf..457a73045 100644
--- a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java
+++ b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java
@@ -1,5 +1,6 @@
 package com.glxp.api.util.udi;
 
+import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
@@ -126,6 +127,15 @@ public class UdiCalCountUtil {
     }
 
 
+    public int getActCount(BasicBussinessTypeEntity bussinessTypeEntity, UdiRelevanceResponse udiRelevanceResponse) {
+        if (bussinessTypeEntity.isUse()) {
+            return getUseActCount(udiRelevanceResponse);
+        } else {
+            return getCirActCount(udiRelevanceResponse);
+        }
+    }
+
+
     public int getActCount(IoCodeTempEntity codeTempEntity) {
         if (codeTempEntity.getRelId() != null) {
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(codeTempEntity.getRelId());