完成单据提交，提示

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

@@ -36,6 +36,7 @@ import com.glxp.api.util.Excel.ExcelHandler;
 import com.glxp.api.util.Excel.Exception.RenException;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.udi.FilterUdiUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -46,6 +47,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @RestController
 public class IoCollectOrderController extends BaseController {
 
@@ -411,23 +413,22 @@ public class IoCollectOrderController extends BaseController {
             CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
             collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
             List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
-            boolean isAllTag = true;
+            StringBuilder msg = new StringBuilder();
-            String msg = "";
             if (CollUtil.isNotEmpty(collectOrderBizResponses)) {
                 for (int i = 0; i < collectOrderBizResponses.size(); i++) {
                     CollectOrderBizResponse collectOrderBizResponse = collectOrderBizResponses.get(i);
                     if (!(StrUtil.isNotEmpty(collectOrderBizResponse.getFinishUdiCode()) || collectOrderBizResponse.getAutoTagStatus() == 2)) {
-                        isAllTag = false;
+                        int count = IntUtil.value(collectOrderBizResponse.getShouldCount()) - IntUtil.value(collectOrderBizResponse.getScanCount());
+                        if (count > 0) {
                             String cpmctymc = collectOrderBizResponse.getCpmctymc();
-                        Integer count = collectOrderBizResponse.getCount();
+                            msg.append(" ").append(cpmctymc).append(":未采集数量").append(count).append(";");
-                        Integer autoResCount = IntUtil.value(collectOrderBizResponse.getAutoResCount());
-                        msg = msg +" "+ cpmctymc + ":未采集数量" + (count - autoResCount) + ";";
                         }
                     }
                 }
-
+            }
-            if (!isAllTag) {
+            log.error("msg:{}", msg.toString());
-                return ResultVOUtils.error(502, "该业务单据未全部赋码【" +  msg.replaceAll(";$", "") + "】,是否强制完成单据？");
+            if (StrUtil.isNotEmpty(msg.toString())) {
+                return ResultVOUtils.error(502, "该业务单据未全部赋码【" + msg.toString().replaceAll(";$", "") + "】,是否强制完成单据？");
             }
         }
         collectOrderService.finishOrder(collectOrderRequest, getUser(), false);

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

@@ -131,7 +131,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
     SysWorkplacePutRelService workplacePutRelService;
     @Resource
     IoCodeLostService codeLostService;
-
     @Resource
     IoCollectSetService collectSetService;
 

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -399,6 +399,24 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         ioCollectOrderBizBackupService.saveBatch(ioCollectOrderBizBackups);
     }
 
+    /**
+     * 自动赋码与手动赋码冲突时解决方案
+     */
+    public void replaceCode(List<IoCollectOrderCodeMan>  collectOrderCodeManList){
+        for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeManList) {
+            // 1. 查找已完成成单据扫码是否已被分配
+
+            // 2. 查找已完成单据码是否已被上传
+
+            // 3. 查找已完成码，标记该码已被手动赋码
+
+            // 4. 查找码库未被使用的码，赋码至已完成的码
+
+            // 5. 查找
+
+        }
+    }
+
 
     /**
      * 完成销售出库自动扣工位库存

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.206:3306/udiwms81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 123456
+    password: Glxp@6066
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20

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

@@ -5498,6 +5498,14 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'reCount',
                          1);
 
 
+CALL Pro_Temp_ColumnWork('io_collect_order_code_man', 'autoCode',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''自动赋码''',
+                         1);
+
+
+
+
+
 CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'uploadYbTime',
                          ' datetime  DEFAULT NULL COMMENT ''医保上传时间''',
                          1);