国产矿新增接口

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

@@ -1915,8 +1915,8 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
-    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map) {
-        return tmsTrainFeign.addDomesticLoadResult(map);
+    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list) {
+        return tmsTrainFeign.addDomesticLoadResult(list);
     }
 
     @ApiOperation(value = "国产矿物流补录装车信息")
@@ -2333,4 +2333,19 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.getPersonByName(personName);
 
     }
+
+    @ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
+    @PostMapping(value = "/findPurchaseOrderList")
+    public Map<String, Object> findPurchaseOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String materialName,
+                                                          String resultForeignShipName){
+        if(map==null)
+            map=new HashMap<>();
+        System.out.println(map);
+        return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName);
+    }
+
 }

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

@@ -232,7 +232,7 @@ public interface TmsTrainFeign {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
-    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list);
 
     @ApiOperation(value = "国产矿物流补录装车信息")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/updateDomesticLoadResult")
@@ -255,4 +255,12 @@ public interface TmsTrainFeign {
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
+    @ApiOperation(value = "根据物资名和外轮船名查询采购订单号")
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                   @RequestParam("apiId")Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("materialName")String materialName,
+                                                   @RequestParam("resultForeignShipName")String resultForeignShipName);
 }

src/main/resources/application-prod.yml

@@ -21,7 +21,7 @@ openfeign:
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+    url: ${TMSTRAINFEIGN_URL:localhost:8086}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign: