修改

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

@@ -235,4 +235,13 @@ public class EMSController extends BaseRESTfulController {
 
         return emsFeign.updateemsticketmanagements(map);
     }
+
+
+    @ApiOperation(value = "一键修复异常")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"一键修复异常"})
+    @PostMapping("/changerAllabnormal")
+    public Map<String, Object> changerAllabnormal(@RequestBody(required = false) Map<String, Object> map) {
+        return emsFeign.changerAllabnormal(map);
+    }
 }

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

@@ -1144,6 +1144,34 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.disposeHandling(map);
     }
 
+    @ApiOperation(value = "保存WMS传递的内转出库数据", notes = "保存WMS传递的内转出库数据")
+    @PostMapping(value = "/preserveMoveListIn")
+    public RESTfulResult preserveMoveListIn(@RequestBody Map<String, Object> mapList) {
+        return tmsFeign.preserveMoveListIn(mapList);
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转入库数据", notes = "保存WMS传递的内转入库数据")
+    @PostMapping(value = "/preserveMoveListOut")
+    public RESTfulResult preserveMoveListOut(@RequestBody Map<String, Object> mapList) {
+        return tmsFeign.preserveMoveListOut(mapList);
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转撤销入库数据", notes = "保存WMS传递的内转撤销入库数据")
+    @PostMapping(value = "/preserveMoveListRevokeOut")
+    public RESTfulResult preserveMoveListRevokeOut(@RequestBody Map<String, Object> mapList) {
+        return tmsFeign.preserveMoveListRevokeOut(mapList);
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转撤销出库数据", notes = "保存WMS传递的内撤销转出库数据")
+    @PostMapping(value = "/preserveMoveListRevokeIn")
+    public RESTfulResult preserveMoveListRevokeIn(@RequestBody Map<String, Object> mapList) {
+        return tmsFeign.preserveMoveListRevokeIn(mapList);
+    }
 
+    @ApiOperation(value = "保存WMS传递的内转撤销出库数据", notes = "保存WMS传递的内撤销转出库数据")
+    @PostMapping(value = "/modifyChange")
+    public RESTfulResult modifyChange(@RequestBody Map<String, Object> params) {
+        return tmsFeign.modifyChange(params);
+    }
 
 }

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

@@ -361,5 +361,16 @@ public class WMSController extends BaseRESTfulController {
         pageList.setTotal((int)data.get("total"));
         return success(pageList);
     }
+
+    @ApiOperation(value = "增加装车记录", notes = "根据List<Map>信息来增加装车记录")
+    public String addList(@RequestBody List<Map<String, Object>> ListMap) {
+        return wmsFeign.addList(ListMap);
+    }
+
+    @ApiOperation(value = "删除装车记录", notes = "根据派车单号信息来删除装车记录")
+    @PutMapping(value = "/deleteSlmDlivDirListByDlivDirnoSeq")
+    public String deleteSlmDlivDirListByDlivDirnoSeq(@RequestParam String dlivDirnoSeq) {
+        return wmsFeign.deleteSlmDlivDirListByDlivDirnoSeq(dlivDirnoSeq);
+    }
 }
 

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

@@ -16,6 +16,4 @@ import java.io.IOException;
 public class systemOaController extends BaseRESTfulController {
 
 
-
-
 }

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

@@ -87,6 +87,10 @@ public interface EmsFeign {
 
     @PostMapping("api/v1/ems/emsticketmanagements/updateemsticketmanagements")
     Map<String, Object> updateemsticketmanagements(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emsdetailsorders/changerAllabnormal")
+    Map<String, Object> changerAllabnormal(@RequestBody(required = false) Map<String, Object> map);
+
 }
 
 

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

@@ -403,6 +403,20 @@ public interface TmsFeign {
     @PostMapping("/api/v1/tms/tmsloadresults/disposeHandling")
     Map<String, Object> disposeHandling(@RequestBody Map<String, Object> map);
 
+    @PostMapping("/api/v1/tms/tmsloadresults/preserveMoveListIn")
+    RESTfulResult preserveMoveListIn(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmsunloadresults/preserveMoveListOut")
+    RESTfulResult preserveMoveListOut(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmsunloadresults/preserveMoveListRevokeOut")
+    RESTfulResult preserveMoveListRevokeOut(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/tmsloadresults/preserveMoveListRevokeIn")
+    RESTfulResult preserveMoveListRevokeIn(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/tms/omstransorders/modifyChange")
+    RESTfulResult modifyChange(@RequestBody Map<String, Object> map);
 }
 
 

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

@@ -107,4 +107,10 @@ public interface WMSFeign {
 
     @PostMapping("api/v1/wms/wmsoutboundresults/updateOutbound")
     Map<String, Object> updateOutbound(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/wms/wmstransportdetails/addList")
+    String addList(@RequestBody List<Map<String, Object>> ListMap);
+
+    @PutMapping("api/v1/wms/wmstransportdetails/deleteSlmDlivDirListByDlivDirnoSeq")
+    String deleteSlmDlivDirListByDlivDirnoSeq(@RequestParam String dlivDirnoSeq);
 }

src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:80}
+    url: ${AMSFEIGN_URL:172.16.90.202:8079}
 #    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:8086}

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1117,8 +1117,9 @@
         </if>
     </select>
     <select id="getMaterialByLike" resultType="java.util.Map">
-        select * from(
+        select distinct * from(
         select
+        distinct
         RC.MATERIAL_ID "materialId",
         RC.MATERIAL_NAME ||
         (CASE
@@ -2148,4 +2149,5 @@
              )
         WHERE "count" > 0
     </select>
+
 </mapper>