From 605287e869286b6c8604cc9e02155c19b9225158 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 5 Nov 2024 15:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E7=A0=81?=
 =?UTF-8?q?=E6=8B=86=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/entity/collect/IoCollectSet.java  | 5 +++++
 .../java/com/glxp/api/service/inout/IoSplitCodeService.java  | 4 +---
 .../com/glxp/api/service/inout/IoSplitFifoInvService.java    | 5 ++++-
 src/main/resources/schemas/schema_v2.4.sql                   | 5 +++++
 4 files changed, 15 insertions(+), 4 deletions(-)

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 93ea1bfbe..ae2013f5c 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
@@ -71,5 +71,10 @@ public class IoCollectSet implements Serializable {
     @ApiModelProperty(value = "起始上传时间")
     private Date startUploadTime;
 
+    @TableField(value = "lastCodeSplit")
+    @ApiModelProperty(value = "是否最后追溯码拆零")
+    private Boolean lastCodeSplit;
+
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index 5be8be428..d54b71b08 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -270,8 +270,6 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
 //            UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(collectOrderBiz.getRelId());
             FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-
-
             filterUdiRelRequest.setId(collectOrderBiz.getRelId());
             filterUdiRelRequest.setPackLevel("1");
             //todo  后面可以 没有搜索到层级为1的
@@ -321,7 +319,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
             int quotient = collectOrderBiz.getUnTagCount() / IntUtil.value(udiRelevanceResponse.getBhxjsl());
             int remainder = collectOrderBiz.getUnTagCount() % IntUtil.value(udiRelevanceResponse.getBhxjsl());
-            //2.如果整盒，从工位队列扣除
+            //2.如果整盒，从工位队列扣除   默认最后一个追溯码拆零
             if (quotient > 0) {
                 List<IoSplitFifoCodeEntity> ioSplitFifoCodeEntities = splitFifoCodeService.findByRelId(putWorkPlaceCode, collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo());
                 if (ioSplitFifoCodeEntities.size() < quotient) {
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
index 5173bfc54..ebe1df0b8 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -52,7 +52,9 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
 
         List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
         if (CollUtil.isNotEmpty(codeList)) {
+            long index = 1;
             for (IoCodeEntity codeEntity : codeList) {
+
                 IoSplitFifoCodeEntity ioSplitFifoCodeEntity = null;
                 if (StrUtil.isEmpty(codeEntity.getSerialNo())) {
                     ioSplitFifoCodeEntity = splitFifoCodeService.findByCode(codeEntity.getCode(), orderEntity.getWorkPlaceCode());
@@ -85,7 +87,8 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                     splitCodeEntity.setWorkPlaceQueueCode(orderEntity.getWorkPlaceQueueCode());
                     splitCodeEntity.setFifoSplit(codeEntity.getFifoSplit());
                     splitCodeEntity.setBusType(orderEntity.getSplitBusType());
-                    splitCodeEntity.setInBactchNo(System.currentTimeMillis() + "");
+                    index++;
+                    splitCodeEntity.setInBactchNo(System.currentTimeMillis() + index + "");
                     splitCodeEntity.setId(null);
                     splitCodeEntities.add(splitCodeEntity);
                 }
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 390af69f2..7d1900a21 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4603,3 +4603,8 @@ CALL Pro_Temp_ColumnWork('io_split_fifo_code', 'workPlaceQueueCode',
 CALL Pro_Temp_ColumnWork('sys_workplace', 'queueStatus',
                          ' tinyint NULL DEFAULT b''0''COMMENT ''是否按照货位上架0:关闭 1:启用''',
                          1);
+
+
+CALL Pro_Temp_ColumnWork('io_collect_set', 'lastCodeSplit',
+                         ' tinyint NULL DEFAULT b''1''COMMENT ''是否最后追溯码拆零0:关闭 1:启用''',
+                         1);