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