fix: 单据库存预警字段

workplace
chenhc 10 months ago
parent 5bccbd41cc
commit c9df2458cc

@ -5,6 +5,7 @@ import com.glxp.api.entity.collect.IoCollectOrder;
import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.collect.CollectOrderRequest;
import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.collect.IoCollectOrderResponse;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -15,4 +16,5 @@ public interface IoCollectOrderMapper extends BaseMapper<IoCollectOrder> {
void clearOrder(); void clearOrder();
void updateInvAlert(@Param("id")Integer id,@Param("invAlert") Integer invAlert);
} }

@ -208,5 +208,12 @@ public class IoCollectOrder implements Serializable {
@ApiModelProperty(value = "排序时间") @ApiModelProperty(value = "排序时间")
private Date orderTime; private Date orderTime;
/**
* 1:; 2:
*/
@TableField(value = "invAlert")
private Integer invAlert;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

@ -21,6 +21,7 @@ import com.glxp.api.res.collect.CollectOrderBizResponse;
import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.collect.IoCollectOrderResponse;
import com.glxp.api.res.inout.IoSplitCodeResponse; import com.glxp.api.res.inout.IoSplitCodeResponse;
import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.auth.SysWorkplaceService;
import io.swagger.models.auth.In;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -147,7 +148,8 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
List<CollectOrderBizResponse> bizList = collectOrderBizMapper.filterList(bizRequest); List<CollectOrderBizResponse> bizList = collectOrderBizMapper.filterList(bizRequest);
if (CollUtil.isNotEmpty(bizList)){ if (CollUtil.isNotEmpty(bizList)){
//自动分配 工位存量、更新splitMap、更新 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<IoSplitFifoCodeMapper, I
* @param bizList * @param bizList
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
void autoAllocationWorkPace(Map<Long, List<IoSplitCodeResponse>> splitMap, List<CollectOrderBizResponse> bizList) { Integer autoAllocationWorkPace(Map<Long, List<IoSplitCodeResponse>> splitMap, List<CollectOrderBizResponse> bizList) {
Integer invAlert = 1;
for (int i = 0; i < bizList.size(); i++) { for (int i = 0; i < bizList.size(); i++) {
CollectOrderBizResponse collectOrderBizResponse = bizList.get(i); CollectOrderBizResponse collectOrderBizResponse = bizList.get(i);
Long relId = collectOrderBizResponse.getRelId(); Long relId = collectOrderBizResponse.getRelId();
@ -192,10 +195,13 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
if (count > 0){//不够分配 if (count > 0){//不够分配
collectOrderBizMapper.updateAutoResCount(bizId,-count); collectOrderBizMapper.updateAutoResCount(bizId,-count);
invAlert = 2;
}else { }else {
collectOrderBizMapper.updateAutoResCount(bizId,collectOrderBizResponse.getCount()); collectOrderBizMapper.updateAutoResCount(bizId,collectOrderBizResponse.getCount());
} }
} }
return invAlert;
} }
} }

@ -86,4 +86,11 @@
TRUNCATE io_collect_order_code_auto; TRUNCATE io_collect_order_code_auto;
TRUNCATE io_collect_order_code_man TRUNCATE io_collect_order_code_man
</select> </select>
<update id="updateInvAlert" parameterType="map">
UPDATE io_collect_order
SET invAlert = #{invAlert}
WHERE id = #{id}
</update>
</mapper> </mapper>

@ -4260,3 +4260,7 @@ CALL Pro_Temp_ColumnWork('basic_products', 'workPlaceCount',
CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoResCount', CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoResCount',
'int NULL DEFAULT NULL COMMENT ''自动扫描分配的工位存量''', 'int NULL DEFAULT NULL COMMENT ''自动扫描分配的工位存量''',
1); 1);
CALL Pro_Temp_ColumnWork('io_collect_order', 'invAlert',
'int NULL DEFAULT b''0'' COMMENT ''库存预警: 1:正常; 2:不足''',
1);

Loading…
Cancel
Save