Compare commits

...

2 Commits

Author SHA1 Message Date
绫Umbrella 242de56894 Merge remote-tracking branch 'origin/master' 2 weeks ago
绫Umbrella fc4f0766c5 物流改写 2 weeks ago
  1. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java

@ -607,7 +607,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
// 校验站点是否可以发送数据
if (stationList.get(0).getStatus().equals(CONVEYOR_LINE_RECEIVE_ONLY) && agvSend) {
return R.fail("起始站点站码无法当开始站点编码");
} else if (!stationList.get(0).getStatus().equals(CONVEYOR_LINE_RECEIVE_ONLY) && !agvSend) {
} else if (!stationList.get(0).getStatus().equals(STATION_RECEIVE_ONLY) && !agvSend) {
return R.fail("起始站点站码无法当开始站点编码");
}
return R.data(startStationCode);
@ -678,7 +678,6 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
if (freeStationList != null && freeStationList.size() != 0) {
//判断是不是镀后库作业中心
if (DistinguishRegionsEnum.includeByWcName(wcName) && !agvSend) {
log.info("是读后库");
freeStationList = freeStationList.stream().filter(s -> s.getStationRegion().equals(task.getStationRegion())).toList();
}

Loading…
Cancel
Save