diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java index 005088904..15790b418 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.collect.IoCollectOrderResponse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,4 +16,5 @@ public interface IoCollectOrderMapper extends BaseMapper { void clearOrder(); + void updateInvAlert(@Param("id")Integer id,@Param("invAlert") Integer invAlert); } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 3a270a757..7f7e48066 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -208,5 +208,12 @@ public class IoCollectOrder implements Serializable { @ApiModelProperty(value = "排序时间") private Date orderTime; + + /** + * 库存预警: 1:正常; 2:不足 + */ + @TableField(value = "invAlert") + private Integer invAlert; + 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 14d55d95a..80d6ae17a 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -21,6 +21,7 @@ import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.inout.IoSplitCodeResponse; import com.glxp.api.service.auth.SysWorkplaceService; +import io.swagger.models.auth.In; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -147,7 +148,8 @@ public class IoSplitFifoCodeService extends ServiceImpl bizList = collectOrderBizMapper.filterList(bizRequest); if (CollUtil.isNotEmpty(bizList)){ //自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数 - autoAllocationWorkPace(splitMap,bizList); + Integer invAlert = autoAllocationWorkPace(splitMap, bizList); + collectOrderMapper.updateInvAlert(order.getId(),invAlert); } } @@ -159,7 +161,8 @@ public class IoSplitFifoCodeService extends ServiceImpl> splitMap, List bizList) { + Integer autoAllocationWorkPace(Map> splitMap, List bizList) { + Integer invAlert = 1; for (int i = 0; i < bizList.size(); i++) { CollectOrderBizResponse collectOrderBizResponse = bizList.get(i); Long relId = collectOrderBizResponse.getRelId(); @@ -192,10 +195,13 @@ public class IoSplitFifoCodeService extends ServiceImpl 0){//不够分配 collectOrderBizMapper.updateAutoResCount(bizId,-count); + invAlert = 2; }else { collectOrderBizMapper.updateAutoResCount(bizId,collectOrderBizResponse.getCount()); } } + + return invAlert; } } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 15a74dc04..acdc2d1f3 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -86,4 +86,11 @@ TRUNCATE io_collect_order_code_auto; TRUNCATE io_collect_order_code_man + + + UPDATE io_collect_order + SET invAlert = #{invAlert} + WHERE id = #{id} + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 5d06ebbba..be77ab957 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4260,3 +4260,7 @@ CALL Pro_Temp_ColumnWork('basic_products', 'workPlaceCount', CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoResCount', 'int NULL DEFAULT NULL COMMENT ''自动扫描分配的工位存量''', 1); + +CALL Pro_Temp_ColumnWork('io_collect_order', 'invAlert', + 'int NULL DEFAULT b''0'' COMMENT ''库存预警: 1:正常; 2:不足''', + 1);