From 0907e42e4e0aefbb556050e7c98d6cbbdd4cc1ca Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 23 Oct 2024 17:34:16 +0800
Subject: [PATCH] =?UTF-8?q?10/23=20bug=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoSplitFifoInvController.java           | 15 +++++++++------
 .../api/service/basic/UdiContrastService.java     |  2 ++
 .../service/collect/IoSplitDesOrderService.java   |  6 +++---
 .../api/service/inout/IoSplitFifoInvService.java  | 12 +++++++++++-
 .../com/glxp/api/vo/basic/InvProductNewVo.java    |  2 +-
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
index ce5865271..78db3ed36 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java
@@ -52,14 +52,17 @@ public class IoSplitFifoInvController extends BaseController {
         }
 
         //判断是否为采集工位
-        Long workPlaceCode = ioSplitFifoInvRequest.getWorkPlaceCode();
-        SysWorkplace workplace = sysWorkplaceService.getWorkplace(workPlaceCode);
-        Integer workPlaceClass = workplace.getWorkPlaceClass();
-        if (workPlaceClass == 1) {
-            SysWorkplacePutRel putWorkPlace = sysWorkplacePutRelService.findPutWorkPlace(workPlaceCode, null);
-            ioSplitFifoInvRequest.setWorkPlaceCode(putWorkPlace.getWorkPlaceCode());
+        if (ioSplitFifoInvRequest.getWorkPlaceCode() != null){
+            Long workPlaceCode = ioSplitFifoInvRequest.getWorkPlaceCode();
+            SysWorkplace workplace = sysWorkplaceService.getWorkplace(workPlaceCode);
+            Integer workPlaceClass = workplace.getWorkPlaceClass();
+            if (workPlaceClass == 1) {
+                SysWorkplacePutRel putWorkPlace = sysWorkplacePutRelService.findPutWorkPlace(workPlaceCode, null);
+                ioSplitFifoInvRequest.setWorkPlaceCode(putWorkPlace.getWorkPlaceCode());
+            }
         }
 
+
         List<IoSplitInvResponse> splitCodeEntities = splitFifoInvService.filterList(ioSplitFifoInvRequest);
         for (IoSplitInvResponse ioSplitCodeResponse : splitCodeEntities) {
             if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) {
diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
index e761f0feb..cf9abb7b1 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
@@ -352,6 +352,7 @@ public class UdiContrastService {
                 udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
                 udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
                 udiProductEntity.setDiType(1);
+                udiProductEntity.setPackLevel(1 + "");
                 udiProductEntity.setScbssfbhph("是");
                 udiProductEntity.setScbssfbhscrq("是");
                 udiProductEntity.setScbssfbhsxrq("是");
@@ -447,6 +448,7 @@ public class UdiContrastService {
             udiProductEntity.setMajorStatus(1);
             udiProductEntity.setPhysicType(3);
         } else {
+            udiProductEntity.setPackLevel(1 + "");
             udiProductEntity.setRequireScanCode(0);
         }
         if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
index 178c8490a..4716441a6 100644
--- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java
@@ -187,7 +187,7 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
         }
         //可用数量
         splitFifoInv.setAvailableCount(availableCount);
-        splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());//入库数量
+//        splitFifoInv.setInCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());//入库数量
         splitFifoInv.setUpdateTime(new Date());
         //更改 库存
         boolean update = ioSplitFifoInvService.updateById(splitFifoInv);
@@ -276,8 +276,8 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I
         //修改产品 库存 入库数
 
         splitFifoInv.setOutCount(splitFifoInv.getOutCount() + addInvDesDetaiRequest.getOutCount());//出库数量
-        splitFifoInv.setReCount(splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount());//剩余数量
-        int availableCount = splitFifoInv.getInCount() - addInvDesDetaiRequest.getOutCount() - splitFifoInv.getLockCount();
+        splitFifoInv.setReCount(splitFifoInv.getInCount() - splitFifoInv.getOutCount());//剩余数量
+        int availableCount = splitFifoInv.getInCount() - splitFifoInv.getOutCount() - splitFifoInv.getLockCount();
         if (availableCount <= -1) {
             throw new JsonException(500, "可用数量库存不足");
         }
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 62969be4a..81e2f26a3 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -163,9 +163,19 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                 if (StrUtil.isEmpty(codeEntity.getSerialNo())) {
                     if (ioSplitFifoCodeEntity != null) {
                         ioSplitFifoCodeEntity.setScanCount(IntUtil.value(ioSplitFifoCodeEntity.getScanCount()) - IntUtil.value(codeEntity.getCount()));
-                        ioSplitFifoCodeEntity.setTotalCount(ioSplitFifoCodeEntity.getTotalCount() + codeEntity.getReCount());
+                        ioSplitFifoCodeEntity.setTotalCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()) - IntUtil.value(codeEntity.getReCount()));
                         ioSplitFifoCodeEntity.setUpdateTime(new Date());
                         splitFifoCodeService.updateById(ioSplitFifoCodeEntity);
+                        IoSplitFifoInv splitFifoInv = findByFifoCode(ioSplitFifoCodeEntity);
+                        if (splitFifoInv != null) {
+                            splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(codeEntity.getReCount()));
+                            splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(codeEntity.getReCount()));
+                            splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()) - IntUtil.value(splitFifoInv.getLockCount()));
+                            updateById(splitFifoInv);
+                        }
+                        if (ioSplitFifoCodeEntity.getScanCount() == 0) {
+                            splitFifoCodeService.removeById(ioSplitFifoCodeEntity);
+                        }
                     }
                 } else {
                     if (ioSplitFifoCodeEntity != null)
diff --git a/src/main/java/com/glxp/api/vo/basic/InvProductNewVo.java b/src/main/java/com/glxp/api/vo/basic/InvProductNewVo.java
index 03bc03e75..215f24161 100644
--- a/src/main/java/com/glxp/api/vo/basic/InvProductNewVo.java
+++ b/src/main/java/com/glxp/api/vo/basic/InvProductNewVo.java
@@ -13,7 +13,7 @@ import java.util.Date;
 @TableName("inv_product")
 public class InvProductNewVo {
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
 //    /**
 //     * UDI码