修改

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

@@ -863,6 +863,12 @@ public class AMScontroller  extends BaseRESTfulController {
         return amsFeign.selectBalanceRemark(map);
     }
 
+    @ApiOperation("获取退货打印备注")
+    @PostMapping("/selectReturnGoodsRemark")
+    RESTfulResult selectReturnGoodsRemark(@RequestBody Map<String,Object> map) {
+        return amsFeign.selectReturnGoodsRemark(map);
+    }
+
     @ApiOperation("销售物流单停用或启用")
     @PostMapping("/deactivateOrEnable")
     RESTfulResult deactivateOrEnable(@RequestBody Map<String,Object> map) {

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

@@ -1446,11 +1446,11 @@ public class RMScontroller extends BaseRESTfulController {
 
     @ApiOperation(value="修改提取比例")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @PutMapping(value = "/extractscale/{id}")
+    @PostMapping(value = "/extractscale/updateRmsExtractScale")
     @LogAround(foreignKeys = {"scaleId"},foreignKeyTypes = {"提取比例"})
-    public Map<String, Object> ExtractscaleUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> updateRmsExtractScale(@RequestBody(required = false) Map<String, Object> map){
         map.put("updateUsername", map.get("userName").toString());
-        return rmsFeign.Extractscaleupdate(id,map);
+        return rmsFeign.updateRmsExtractScale(map);
     }
 
     //   ========================= 计算公式

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

@@ -1044,6 +1044,10 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.disposeQueueResult(map);
     }
 
-
-
+    @ApiOperation(value = "禁用/启用运输订单")
+    @PostMapping("/banTransOrder")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String,Object> banTransOrder(@RequestBody Map<String,Object> map) {
+        return tmsFeign.banTransOrder(map);
+    }
 }

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

@@ -321,6 +321,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectBalanceRemark")
     RESTfulResult selectBalanceRemark(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/selectReturnGoodsRemark")
+    RESTfulResult selectReturnGoodsRemark(@RequestBody Map<String, Object> map);
+
     @PostMapping(value = "api/v1/ams/amstransplans/deactivateOrEnable")
     RESTfulResult deactivateOrEnable(@RequestBody Map<String, Object> map);
 

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

@@ -728,8 +728,8 @@ public interface RmsFeign {
     @PutMapping("api/v1/rms/rmsextractscales/logicdelete")
     Map<String, Object> Extractscalelogicdelete(@RequestBody(required = false) Map<String, Object> map);
 
-    @PutMapping("api/v1/rms/rmsextractscales/{id}")
-    Map<String, Object> Extractscaleupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/rms/rmsextractscales/updateRmsExtractScale")
+    Map<String, Object> updateRmsExtractScale(@RequestBody(required = false) Map<String, Object> map);
 
     //==================计算公式
 

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

@@ -365,6 +365,10 @@ public interface TmsFeign {
 
     @PostMapping(value = "/api/v1/tms/tmsqueuegrids/getGridAllData")
     Map<String, Object> getGridAllData(Map<String, Object> map);
+
+
+    @PostMapping("api/v1/tms/omstransorders/banTransOrder")
+    Map<String, Object> banTransOrder(@RequestBody(required = false) Map<String, Object> map);
 }