1、运单接口调用切换

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtWaybillOrderController.java

@@ -222,8 +222,8 @@ public class KwtWaybillOrderController {
      * @date 2023/7/26
      **/
     @PostMapping("/loading")
-    public HttpResult loading(@RequestBody @Valid WaybillOrderTicketDto params){
-        return waybillOrderService.loading(params);
+    public HttpResult loading(@RequestBody @Valid WaybillOrderTicketV2Dto params){
+        return waybillOrderService.loadingV1(params);
     }
 
     /**
@@ -244,8 +244,8 @@ public class KwtWaybillOrderController {
      * @date 2023/7/26
      **/
     @PostMapping("/unloading")
-    public HttpResult unloading(@RequestBody @Valid WaybillOrderTicketDto params){
-        return waybillOrderService.unloading(params);
+    public HttpResult unloading(@RequestBody @Valid WaybillOrderTicketV2Dto params){
+        return waybillOrderService.unloadingV1(params);
     }
 
     /**
@@ -266,8 +266,8 @@ public class KwtWaybillOrderController {
      * @date 2023/7/26
      **/
     @PostMapping("/editTicketV1")
-    public HttpResult editTicketV1(@RequestBody @Valid WaybillOrderTicketV1Dto params){
-        return waybillOrderService.editTicket(params);
+    public HttpResult editTicketV1(@RequestBody @Valid WaybillOrderTicketV3Dto params){
+        return waybillOrderService.editTicketV1(params);
     }
 
     /**
@@ -299,8 +299,8 @@ public class KwtWaybillOrderController {
      * @date 2023/7/26
      **/
     @PostMapping("/approvalEditTicket")
-    public HttpResult approvalEditTicket(@RequestBody @Valid WaybillOrderTicketApprovalDto params){
-        return waybillOrderService.approvalEditTicket(params);
+    public HttpResult approvalEditTicket(@RequestBody @Valid WaybillOrderTicketApprovalV1Dto params){
+        return waybillOrderService.approvalEditTicketV1(params);
     }
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsOrderGoodsService.java

@@ -292,7 +292,7 @@ public class KwtLogisticsOrderGoodsService {
             Map<String, String> finalUnitMap = unitMap;
             units = BeanUtils.copyToList(assistUnit, GoodsUnitVo.class);
             units.forEach(e->{
-                e.setFromUnit(finalUnitMap != null ? finalUnitMap.get(e.getFromUnit()) : null);
+                e.setFromUnitName(finalUnitMap != null ? finalUnitMap.get(e.getFromUnit()) : null);
                 e.setToUnitName(finalUnitMap != null ? finalUnitMap.get(e.getToUnit()) : null);
             });
         }