1

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -58,7 +58,7 @@ public class LogAspect {
         //获取该切点处的方法及入参
         Method method = ((MethodSignature) point.getSignature()).getMethod();
         Object[] requestParams = point.getArgs();
-        JSONObject map = null ;
+        JSONObject map = null;
         for(Object param:requestParams){
             if(param!=null && param instanceof Map){
                 map = JSONObject.parseObject(JSONObject.toJSONString(param));

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

@@ -779,4 +779,22 @@ public class TMSController extends BaseRESTfulController {
     RESTfulResult getDriverDayJobForApp(@RequestBody Map<String,Object> map,Integer apiId) {
         return tmsFeign.getDriverDayJobForApp(map,apiId);
     }
+
+    @ApiOperation(value = "确认出库", notes = "确认出库")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/outBound")
+    public RESTfulResult outBound(@RequestBody Map<String, Object> map) {
+        return tmsFeign.outBound(map);
+    }
+
+    @ApiOperation(value = "撤销出库", notes = "撤销出库")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/revokeOutBound")
+    public RESTfulResult revokeOutBound(@RequestBody Map<String, Object> map) {
+        return tmsFeign.revokeOutBound(map);
+    }
 }

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

@@ -281,6 +281,12 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/omstransorders/getDriverDayJobForApp")
     RESTfulResult getDriverDayJobForApp(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/outBound")
+    RESTfulResult outBound(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/revokeOutBound")
+    RESTfulResult revokeOutBound(@RequestBody Map<String, Object> map);
 }
 
 

src/main/resources/application-prod.yml

@@ -26,11 +26,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${AMSFEIGN_URL:localhost:8079}
+#    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${TMSFEIGN_URL:localhost:8086}
+#    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign: