|
|
@@ -59,7 +59,7 @@ public class KwmLineFreightRateService {
|
|
|
}
|
|
|
String loadName = addLineFreightRateParam.getLoadName();
|
|
|
String unloadName = addLineFreightRateParam.getUnloadName();
|
|
|
- if (Objects.equals(loadName,unloadName)){
|
|
|
+ if (Objects.equals(loadName, unloadName)) {
|
|
|
throw new BusinessException("路径起始结束位置不能相同!");
|
|
|
}
|
|
|
KwmAddress load = addressService.getByNameAndEntId(loadName, entId);
|
|
|
@@ -100,7 +100,7 @@ public class KwmLineFreightRateService {
|
|
|
KwmLineFreightRate freightRate = BeanUtil.copyProperties(param, KwmLineFreightRate.class);
|
|
|
String loadName = param.getLoadName();
|
|
|
String unloadName = param.getUnloadName();
|
|
|
- if (Objects.equals(loadName,unloadName)){
|
|
|
+ if (Objects.equals(loadName, unloadName)) {
|
|
|
throw new BusinessException("路径起始结束位置不能相同!");
|
|
|
}
|
|
|
if (!Objects.equals(loadName, lineFreightRate.getLoadName())) {
|
|
|
@@ -303,4 +303,20 @@ public class KwmLineFreightRateService {
|
|
|
List<KwmLineFreightRate> list = lineFreightRateMapper.selectList(queryWrapper);
|
|
|
return BeanUtil.copyToList(list, LineFreightRateFindListResVO.class);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @param param
|
|
|
+ * @return java.util.List<com.sckw.manage.model.vo.res.LineFreightRateListResVO>
|
|
|
+ * @desc 物流订单路径选择查询
|
|
|
+ * @author yzc
|
|
|
+ * @date 2024/3/13 16:11
|
|
|
+ */
|
|
|
+ public List<LineFreightRateListResVO> choose(ChooseLineFreightRateParam param) {
|
|
|
+ LambdaQueryWrapper<KwmLineFreightRate> wrapper = new LambdaQueryWrapper<>();
|
|
|
+ wrapper.in(KwmLineFreightRate::getLoadName, param.getLoadNames())
|
|
|
+ .in(KwmLineFreightRate::getUnloadName, param.getUnloadNames())
|
|
|
+ .eq(KwmLineFreightRate::getDelFlag, Global.NO);
|
|
|
+ List<KwmLineFreightRate> list = lineFreightRateMapper.selectList(wrapper);
|
|
|
+ return BeanUtil.copyToList(list, LineFreightRateListResVO.class);
|
|
|
+ }
|
|
|
}
|