From e6b631a5c75fc232adc63bfba3a91167fb0b4add Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 2 Nov 2024 19:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E4=BD=8D=E8=B4=A7?=
 =?UTF-8?q?=E4=BD=8D=E9=98=9F=E5=88=97=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoCodeTempController.java           | 36 +++++++++++--------
 .../service/inout/IoSplitFifoCodeService.java |  5 +++
 2 files changed, 27 insertions(+), 14 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 c5570825b..b18cf1d54 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1567,16 +1567,30 @@ public class IoCodeTempController extends BaseController {
             udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false);
 
             if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
-                if (orderEntity != null && StrUtil.isNotEmpty(orderEntity.getWorkPlaceQueueCode()) && CollUtil.isNotEmpty(codeEnttitys)) {
-                    boolean isSame = false;
-                    for (IoCodeTempEntity ioOrderDetailCodeEntity : codeEnttitys) {
-                        if (ioOrderDetailCodeEntity.getRelId().equals(udiRelevanceResponse.getId())) {
-                            isSame = true;
+
+                if (StrUtil.isNotEmpty(orderEntity.getWorkPlaceQueueCode())) {
+                    IoSplitFifoCodeEntity splitFifoCodeEntity = splitFifoCodeService.findByQueueCode(orderEntity.getWorkPlaceQueueCode());
+                    if (splitFifoCodeEntity != null) {
+                        if (!udiRelevanceResponse.getId().equals(splitFifoCodeEntity.getRelId())) {
+                            return ResultVOUtils.error(507, "上货产品不符！");
+                        }
+                    }
+
+                    if (orderEntity != null && CollUtil.isNotEmpty(codeEnttitys)) {
+                        boolean isSame = false;
+                        for (IoCodeTempEntity ioOrderDetailCodeEntity : codeEnttitys) {
+                            if (ioOrderDetailCodeEntity.getRelId().equals(udiRelevanceResponse.getId())) {
+                                isSame = true;
+                            }
                         }
+                        if (!isSame)
+                            return ResultVOUtils.error(507, "上货产品不符！");
                     }
-                    if (!isSame)
-                        return ResultVOUtils.error(507, "上货产品不符！");
+
+
                 }
+
+
             }
 
             if (udiRelevanceResponses.size() >= 1) {
@@ -2680,13 +2694,7 @@ public class IoCodeTempController extends BaseController {
             }
         }
         addCodeResult.setOrderId(orderId);
-        try {
-            transInoutService.genOrderDetailCode(orderEntity, genDetaiEntity);
-        } catch (JsonException e) {
-            if (e.getCode() == 507) {
-                return ResultVOUtils.error(e.getCode(), e.getMessage());
-            }
-        }
+        transInoutService.genOrderDetailCode(orderEntity, genDetaiEntity);
 
         return ResultVOUtils.success(addCodeResult);
     }
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
index 4ff825fca..3945ddf5e 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java
@@ -462,4 +462,9 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
     }
 
 
+    public IoSplitFifoCodeEntity findByQueueCode(String code) {
+        return getOne(new LambdaQueryWrapper<IoSplitFifoCodeEntity>().eq(IoSplitFifoCodeEntity::getWorkPlaceQueueCode, code).last("limit 1"));
+    }
+
+
 }