最后一个码拆零

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

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) {

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

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