'销售与结算'

src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -762,4 +762,11 @@ public class OMSController {
     public Map<String, Object> getAllResultLineMes(Integer orderId){
         return omsFeign.getAllResultLineMes(orderId);
     }
+
+    @ApiOperation(value = "正常关闭运输订单")
+    @PostMapping("/closeInwardOrder")
+    public Map<String, Object> closeInwardOrder(Integer orderId){
+        return omsFeign.closeInwardOrder(orderId);
+    }
+
 }

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -2012,4 +2012,9 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
+
+    @PostMapping("/sendMeasureCommission")
+    public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.sendMeasureCommission(map);
+    }
 }

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -448,5 +448,8 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getAllResultLineMes")
     Map<String, Object> getAllResultLineMes(@RequestParam("orderId") Integer orderId);
 
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
+    Map<String, Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
+
 }
 

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -425,6 +425,10 @@ public interface TmsTruckFeign {
                                          @RequestParam("carrierSsoId")   String carrierSsoId
     );
 
-}
+
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
+    Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
+    }