From 1bbb57dd78d4fdf6fef42c963f20bee00bd35fde Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 9 Jan 2025 10:08:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=AA=E5=85=81=E8=AE=B8=E4=B8=8A?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E4=B8=80=E4=BA=A7=E5=93=81=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inout/IoCodeTempController.java  | 13 ++++++++++++-
 .../com/glxp/api/entity/collect/IoCollectSet.java   |  4 ++++
 src/main/resources/schemas/schema_v2.4.sql          |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

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 fa17d7e0f..06fdda736 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -120,6 +120,8 @@ public class IoCodeTempController extends BaseController {
 
     @Resource
     IoCollectOrderBackupService ioCollectOrderBackupService;
+    @Resource
+    IoCollectSetService collectSetService;
 
 
     /**
@@ -1714,6 +1716,8 @@ public class IoCodeTempController extends BaseController {
             }
 
             if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
+                //工位上货 只允许上货一个产品 开关以及控制
+                IoCollectSet collectSet = collectSetService.getSet();
                 // 判断货位里面是否有相同产品
                 if (orderEntity != null && StrUtil.isNotEmpty(orderEntity.getWorkPlaceQueueCode())) {
                     SysWorkplaceQueue workplaceQueue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>()
@@ -1757,8 +1761,15 @@ public class IoCodeTempController extends BaseController {
                         sysWorkplaceQueue.setRelId(udiRelevanceResponse.getId() + "");
                         sysWorkplaceQueueService.updateById(sysWorkplaceQueue);
                     }
-                }
+                } else if (orderEntity != null && CollUtil.isNotEmpty(codeEnttitys) && IntUtil.value(collectSet.getSplitOutOnlyProductSwitch())) {
+                    for (IoCodeTempEntity ioOrderDetailCodeEntity : codeEnttitys) {
+                        //开启了 只允许上货一个产品开关
+                        if (!ioOrderDetailCodeEntity.getRelId().equals(udiRelevanceResponse.getId())) {
+                            return ResultVOUtils.error(507, "当前单据下只允许上货单一产品！");
+                        }
+                    }
 
+                }
 
             }
 
diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
index 8dd145a80..47895c48a 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
@@ -91,5 +91,9 @@ public class IoCollectSet implements Serializable {
     @ApiModelProperty(value = "是否启用寄售预验收扫码校验 ")
     private Boolean isScanCodeCheck;
 
+    @TableField(value = "splitOutOnlyProductSwitch")
+    @ApiModelProperty(value = "只允许上货单一产品开关0")
+    private Boolean splitOutOnlyProductSwitch;
+
     private static final long serialVersionUID = 1L;
 }
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index f8996097c..15d1c0e8d 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -5125,4 +5125,7 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'isSplitCode',
                          ' tinyint NULL DEFAULT b''1''COMMENT ''是否拆零码''',
                          1);
 
+CALL Pro_Temp_ColumnWork('io_collect_set', 'splitOutOnlyProductSwitch',
+                         ' tinyint NULL DEFAULT b''0''COMMENT ''只允许上货单一产品开关0:关闭 1:启用''',
+                         1);