根据工位货位队列判断是否同一个产品

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

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