From 287057e2fb53f4513ddb74ab802482993a953bb1 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 13 Nov 2024 14:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=B7=A5=E4=BD=8D=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=8B=86=E9=9B=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/service/inout/IoSplitCodeService.java   | 9 +++++----
 .../glxp/api/service/inout/IoSplitFifoInvService.java    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

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 6e70d9b59..6ed04b51d 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -98,7 +98,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
         //2.如果拆零表为空，则自动从预出库队列中获拉取数据
         if (CollUtil.isEmpty(ioSplitCodeEntities)) {
-            addFifoCode(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), IntUtil.value(collectOrderBiz.getUnTagCount()));
+            addFifoCode(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), IntUtil.value(collectOrderBiz.getUnTagCount()), putWorkPlaceCode);
             ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), putWorkPlaceCode);
         }
         //3.如果拆零表不为空，则开始扣除数量
@@ -138,7 +138,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
         if (unCount > 0) {
             //4.拆零表数量不足，则从预出库队列中获取数据
-            Integer fifoCount = addFifoCode(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), unCount);
+            Integer fifoCount = addFifoCode(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), unCount, putWorkPlaceCode);
             if (fifoCount == 0) {
                 //预出库队列数量不足
                 collectOrderBiz.setTagStatus(2);
@@ -512,7 +512,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
     public void preAutoTagCode(IoCollectOrder collectOrder) {
         Long putWorkPlaceCode = null;
         //获取上货工位
-         SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
+        SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
         if (sysWorkplacePutRel != null)
             putWorkPlaceCode = sysWorkplacePutRel.getWorkPlaceCode();
 
@@ -566,12 +566,13 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
     /**
      * 从预出库队列里面取出数据，添加至拆零表
      */
-    public Integer addFifoCode(Long relId, String batchNo, Integer needCount) {
+    public Integer addFifoCode(Long relId, String batchNo, Integer needCount, Long putWorkPlaceCode) {
 
         List<IoSplitFifoCodeEntity> splitFifoCodeEntities = splitFifoCodeService
                 .list(new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
                         .eq(IoSplitFifoCodeEntity::getRelId, relId)
                         .eq(StrUtil.isNotEmpty(batchNo), IoSplitFifoCodeEntity::getBatchNo, batchNo)
+                        .eq(putWorkPlaceCode != null, IoSplitFifoCodeEntity::getWorkPlaceCode, putWorkPlaceCode)
                         .orderByAsc(IoSplitFifoCodeEntity::getInBactchNo)
                 );
         Integer count = 0;
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 3799e9a0b..d0ccae076 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -126,7 +126,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                         .remark(null)
                         .enableRemind(false)
                         .invRemindCount(0)
-                        .workPlaceQueueCode(orderEntity.getWorkPlaceQueueCode() == null ? "DMQ0010101" : orderEntity.getWorkPlaceQueueCode()).build();
+                        .workPlaceQueueCode(orderEntity.getWorkPlaceQueueCode()).build();
 //                if (isOnlyInv) {
 //                    splitFifoInv.setBusType(ioSplitFifoCodeEntity.getBusType());
 //                }