From 38dcaae1e2f3d2f6ad444736b0f13e4bbe152577 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 28 Sep 2024 21:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=BA=93=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8A=E8=B4=A7=EF=BC=8C=E6=8B=86=E9=9B=B6=E7=AD=89=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java     |  2 +-
 .../controller/inout/IoSplitController.java   |  5 ++--
 .../api/service/inout/IoSplitCodeService.java | 23 +++++++------------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 7aebc8b64..38589bbc1 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -161,7 +161,7 @@ public class IoCollectOrderController extends BaseController {
         request.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
         request.setBusType(collectOrderRequest.getBusType());
         //根据更改用户查询单据 防止两个用户分配同一单据
-        request.setUpdateUser(getUserId());
+//        request.setUpdateUser(getUserId());
         request.setTagStatus(2);
         List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(request);
         if (CollUtil.isNotEmpty(orderResponses))
diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java
index 10f617186..115c8731f 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java
@@ -134,13 +134,14 @@ public class IoSplitController extends BaseController {
             return ResultVOUtils.error(500, "未找到单据");
         }
 
-        if (collectOrder.getTagStatus() == 2){
-            return ResultVOUtils.error(501,"当前单据正在处理中,请重新选择单据");
+        if (collectOrder.getTagStatus() == 2) {
+            return ResultVOUtils.error(501, "当前单据正在处理中,请重新选择单据");
         }
 
 
         SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
         if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) {
+            collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode());
             splitCodeService.preAutoTagCode(collectOrder);
 //            //未拆零
 //            if (IntUtil.value(collectOrder.getSplitStatus()) != 2) {
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index 36c39ef94..7dda1af96 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -71,14 +71,14 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         return null;
     }
 
-    public void splitRemove(IoCollectOrderBiz collectOrderBiz, IoCollectOrder collectOrder) {
+    public void splitRemove(IoCollectOrderBiz collectOrderBiz, IoCollectOrder collectOrder, Long putWorkPlaceCode) {
         //1.按照先进先出原则，查询拆零表，获取拆零表ID
-        List<IoSplitCodeEntity> ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), collectOrder.getWorkPlaceCode());
+        List<IoSplitCodeEntity> ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), putWorkPlaceCode);
 
         //2.如果拆零表为空，则自动从预出库队列中获拉取数据
         if (CollUtil.isEmpty(ioSplitCodeEntities)) {
             addFifoCode(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), IntUtil.value(collectOrderBiz.getCount()));
-            ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), collectOrder.getWorkPlaceCode());
+            ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), putWorkPlaceCode);
         }
         //3.如果拆零表不为空，则开始扣除数量
         int count = 0;
@@ -126,7 +126,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 //                throw new JsonException(500, "提交失败，工位库存数量不足！");
             } else {
                 //再次执行赋码
-                ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), collectOrder.getWorkPlaceCode());
+                ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), putWorkPlaceCode);
                 for (IoSplitCodeEntity ioSplitCodeEntity : ioSplitCodeEntities) {
                     count = IntUtil.value(ioSplitCodeEntity.getRemainCount()) - unCount;
                     collectOrderCodeAutoService.save(IoCollectOrderCodeAuto.builder()
@@ -314,7 +314,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
             }
             //.如果拆零，拆零表扣除
             if (remainder > 0) {
-                splitRemove(collectOrderBiz, collectOrder);
+                splitRemove(collectOrderBiz, collectOrder, putWorkPlaceCode);
             }
         }
         ArrayList<IoCollectOrderBizBackup> ioCollectOrderBizBackups = new ArrayList<>();
@@ -368,7 +368,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                     .sum();
             collectOrderBiz.setTempWorkPlaceCount(total);
             List<IoSplitCodeEntity> splitCodeEntities = splitCodeService.findSplitCodes(collectOrderBiz.getRelId()
-                    , collectOrderBiz.getBatchNo(), sysWorkplacePutRel.getWorkPlaceCode());
+                    , collectOrderBiz.getBatchNo(), putWorkPlaceCode);
             int splitTotal = splitCodeEntities.stream()
                     .mapToInt(IoSplitCodeEntity::getRemainCount)
                     .sum();
@@ -422,16 +422,9 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         for (IoSplitFifoCodeEntity splitFifoCodeEntity : splitFifoCodeEntities) {
             IoSplitCodeEntity splitCodeEntity = new IoSplitCodeEntity();
             BeanUtils.copyProperties(splitFifoCodeEntity, splitCodeEntity);
-            if (IntUtil.value(splitFifoCodeEntity.getFifoSplit()) == 1) {
-                //拆零
-                count = IntUtil.value(splitFifoCodeEntity.getTotalCount()) + count;
-                splitCodeEntity.setRemainCount(splitCodeEntity.getTotalCount());
-            } else {
-                //整取
-                count = IntUtil.value(splitFifoCodeEntity.getScanCount()) + count;
-                splitCodeEntity.setRemainCount(splitCodeEntity.getScanCount());
-            }
 
+            count = IntUtil.value(splitFifoCodeEntity.getTotalCount()) + count;
+            splitCodeEntity.setRemainCount(splitCodeEntity.getTotalCount());
 
             splitCodeEntity.setStatus(1);
             splitCodeEntity.setFifoSplit(splitFifoCodeEntity.getFifoSplit());