根据配置修改是否启用扫码拆零确认

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -438,6 +438,11 @@ public class IoCollectOrderController extends BaseController {
         /**
          * 取货确认
          */
+        IoCollectSet collectSet = collectSetService.getSet();
+        //根据配置是否需要拆零确认
+        if (!IntUtil.value(collectSet.getGetSplitConfirm())) {
+            confirmOrderBiz.setSkipSplitConfirm(true);
+        }
         ConfirmResponse splitInfo = splitCodeService.confirmBizAutiTagCode(confirmOrderBiz, confirmOrderBiz.getQueueCode(),
                 confirmOrderBiz.getConfirmSplitCode(), confirmOrderBiz.getSkipSplitConfirm());
         return ResultVOUtils.success(splitInfo);

src/main/java/com/glxp/api/controller/collect/IoCollectSetController.java

@@ -25,7 +25,7 @@ public class IoCollectSetController extends BaseController {
 
     @GetMapping("/udiwms/ioSplit/collect/getSet")
     public BaseResponse getSet() {
-        IoCollectSet  collectSet =  collectSetService.getSet();
+        IoCollectSet collectSet = collectSetService.getSet();
         return ResultVOUtils.success(collectSet);
     }
 

src/main/java/com/glxp/api/entity/collect/IoCollectSet.java

@@ -72,9 +72,14 @@ public class IoCollectSet implements Serializable {
     private Date startUploadTime;
 
     @TableField(value = "lastCodeSplit")
-    @ApiModelProperty(value = "是否最后追溯码拆零")
+    @ApiModelProperty(value = "是否启用扫码拆零确认")
     private Boolean lastCodeSplit;
 
+
+    @TableField(value = "getSplitConfirm")
+    @ApiModelProperty(value = "是否启用取药拆零确认")
+    private Boolean getSplitConfirm;
+
     @TableField(value = "lastCodeSplit")
     @ApiModelProperty(value = "自动上传已完成单据轮询时间")
     private Integer startUploadHour;

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -185,7 +185,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         // 产品采购类型
         // 拿到产品采购类型
         // code  purType  查找 io_collect_code_backup 是否存在 不存在 提示 当前码未进入预验收/寄售库
-        if (collectSet.getIsScanCodeCheck()) {
+        if (IntUtil.value(collectSet.getIsScanCodeCheck())) {
             if (IntUtil.value(udiRelevanceResponse.getPurType()) != 1 && IntUtil.value(udiRelevanceResponse.getPurType()) != 0) {
                 IoCollectCodeBackup collectCodeBackup = ioCollectCodeBackService.getOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
                         .eq(IoCollectCodeBackup::getCode, code)
@@ -350,7 +350,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                                     throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
                                 } else {
                                     collectOrderBiz.setSplitUnCheck(true);
-                                    throw new JsonException(503, collectOrderBiz.getId() + ";" + count1 + ";" + collectOrderBiz.getCpmctymc() + ";" + "扫码数量超出!");
+                                    if (IntUtil.value(collectSet.getLastCodeSplit())) {
+                                        throw new JsonException(503, collectOrderBiz.getId() + ";" + count1 + ";" + collectOrderBiz.getCpmctymc() + ";" + "扫码数量超出!");
+                                    }
+
                                 }
                             }
                         }
@@ -450,7 +453,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                                     throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
                                 } else {
                                     collectOrderBiz.setSplitUnCheck(true);
-                                    throw new JsonException(503, collectOrderBiz.getId() + ";" + count1 + ";" + collectOrderBiz.getCpmctymc() + ";" + "扫码数量超出!");
+                                    if (IntUtil.value(collectSet.getLastCodeSplit())) {
+                                        throw new JsonException(503, collectOrderBiz.getId() + ";" + count1 + ";" + collectOrderBiz.getCpmctymc() + ";" + "扫码数量超出!");
+                                    }
                                 }
                             } else {
                                 throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_hlfy_pro?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_cl?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/schemas/schema_v2.4.sql

@@ -4756,7 +4756,11 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'grid',
 
 
 CALL Pro_Temp_ColumnWork('io_collect_set', 'lastCodeSplit',
-                         ' tinyint NULL DEFAULT b''1''COMMENT ''是否最后追溯码拆零0:关闭 1:启用''',
+                         ' tinyint NULL DEFAULT b''1''COMMENT ''是否启用扫码拆零确认 0:关闭 1:启用''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('io_collect_set', 'getSplitConfirm',
+                         ' tinyint NULL DEFAULT b''1''COMMENT ''是否启用取药拆零确认0:关闭 1:启用''',
                          1);
 
 CREATE TABLE IF NOT EXISTS `sys_workplace_layer`