diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java index c161341fc..8b181a107 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java @@ -19,7 +19,7 @@ import javax.annotation.Resource; import java.util.List; /** - * 科室拆零队列(先进先出) + * 科室拆零队列(先进先出)工位库存 */ @Slf4j @RestController diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java b/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java index 183382a0c..3d698b3c8 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectCode.java @@ -118,6 +118,13 @@ public class IoCollectCode implements Serializable { @ApiModelProperty(value = "") private Integer fifoSplit; + /** + * 出入库类型(1:入库;2:出库) + */ + @TableField(value = "inoutType") + @ApiModelProperty(value = "出入库类型") + private Integer inoutType; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java index 7cc43132e..175986626 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -71,6 +71,7 @@ public class IoSplitFifoCodeService extends ServiceImpl invReminds = splitFifoCodeMapper.findInvRemind(workPlaceCode); - if (CollUtil.isEmpty(invReminds)){ - return "当前工位存量提醒:" + "0"; - } - invReminds.forEach( item -> { + if (CollUtil.isEmpty(invReminds)) { + return "当前工位存量提醒:" + "0"; + } + invReminds.forEach(item -> { Integer groupCount = item.getGroupCount(); - if (groupCount < invRemindNumber){ + if (groupCount < invRemindNumber) { String cpmctymc = item.getCpmctymc(); String batchNo = item.getBatchNo(); - if (StrUtil.isBlank(batchNo)){ - msg[0] = msg[0] + cpmctymc + "存量为:"+groupCount; - }else { - msg[0] = msg[0] + cpmctymc + "["+batchNo+"]存量为:"+groupCount; + if (StrUtil.isBlank(batchNo)) { + msg[0] = msg[0] + cpmctymc + "存量为:" + groupCount; + } else { + msg[0] = msg[0] + cpmctymc + "[" + batchNo + "]存量为:" + groupCount; } } }); @@ -100,4 +101,21 @@ public class IoSplitFifoCodeService extends ServiceImpl