Преглед изворни кода

新增物流订单路径选择查询接口

yzc пре 1 година
родитељ
комит
5b13318ecf

+ 5 - 0
sckw-modules/sckw-manage/src/main/java/com/sckw/manage/controller/KwmLineFreightRateController.java

@@ -53,6 +53,11 @@ public class KwmLineFreightRateController {
         return HttpResult.ok(lineFreightRateService.select(params));
     }
 
+    @PostMapping(value = "/choose", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult choose(@RequestBody ChooseLineFreightRateParam params) {
+        return HttpResult.ok(lineFreightRateService.choose(params));
+    }
+
     @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
     public void export(@RequestBody ExportLineFreightRateParam params, HttpServletResponse response) {
         List<LineFreightRateExport> list = lineFreightRateService.export(params);

+ 37 - 0
sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/ChooseLineFreightRateParam.java

@@ -0,0 +1,37 @@
+package com.sckw.manage.model.vo.req;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @author: yzc
+ * @date: 2024-03-01  15:00
+ * @desc: 选择运价路径请求参数
+ */
+@Getter
+@Setter
+@ToString
+@EqualsAndHashCode(callSuper = false)
+public class ChooseLineFreightRateParam {
+
+    /**
+     * 装货地名称集合
+     */
+    @NotEmpty(message = "装货地名不能为空")
+    @Size(min = 1,max = 3,message = "装货地名称最多3条")
+    private List<String> loadNames;
+
+    /**
+     * 卸货地名称集合
+     */
+    @NotEmpty(message = "卸货地名不能为空")
+    @Size(min = 1,max = 3,message = "卸货地名称最多3条")
+    private List<String> unloadNames;
+
+}

+ 18 - 2
sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmLineFreightRateService.java

@@ -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);
+    }
 }