工位扣减库存扫码数量问题

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());

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);
                 }
             }
         }

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());