From bf44ae2dd15b2b139ce56b1ba1294fdfd220c763 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 25 十二月 2024 17:13:34 +0800 Subject: [PATCH] #问题修复 1. 列表字段空间调整 2. 地址链接放至配置文件中 3. 定时任务执行完成后,状态修改补上 4. 修改状态时,需校验上一步状态是否对应 5. 下发任务完成后,查看是否修改状态为2 7. 任务状态列表,数据显示不全问题修复 8. 波次列表,表格合并问题导致多订单出库问题 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LanewayRuleServiceImpl.java | 58 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LanewayRuleServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LanewayRuleServiceImpl.java index 6c5523d..1ee13a5 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LanewayRuleServiceImpl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LanewayRuleServiceImpl.java @@ -1,29 +1,29 @@ -package com.zy.asrs.wms.asrs.service.impl; - -import com.zy.asrs.wms.asrs.entity.Loc; -import com.zy.asrs.wms.asrs.mapper.LanewayRuleMapper; -import com.zy.asrs.wms.asrs.entity.LanewayRule; -import com.zy.asrs.wms.asrs.service.LanewayRuleService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service("lanewayRuleService") -public class LanewayRuleServiceImpl extends ServiceImpl<LanewayRuleMapper, LanewayRule> implements LanewayRuleService { - - @Override - public LanewayRule getLaneByLoc(Loc loc) { - List<LanewayRule> list = this.list(); - for (LanewayRule rule : list) { - List<Integer> laneX = rule.getLaneX$(); - List<Integer> laneY = rule.getLaneY$(); - laneX.addAll(laneY); - - if (laneX.contains(loc.getRow1())) { - return rule; - } - } - return null; - } -} +package com.zy.asrs.wms.asrs.service.impl; + +import com.zy.asrs.wms.asrs.entity.Loc; +import com.zy.asrs.wms.asrs.mapper.LanewayRuleMapper; +import com.zy.asrs.wms.asrs.entity.LanewayRule; +import com.zy.asrs.wms.asrs.service.LanewayRuleService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("lanewayRuleService") +public class LanewayRuleServiceImpl extends ServiceImpl<LanewayRuleMapper, LanewayRule> implements LanewayRuleService { + + @Override + public LanewayRule getLaneByLoc(Loc loc) { + List<LanewayRule> list = this.list(); + for (LanewayRule rule : list) { + List<Integer> laneX = rule.getLaneX$(); + List<Integer> laneY = rule.getLaneY$(); + laneX.addAll(laneY); + + if (laneX.contains(loc.getRow1())) { + return rule; + } + } + return null; + } +} -- Gitblit v1.9.1