Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -2046,6 +2046,18 @@ public class AMScontroller{
         return amsFeign.getNotice(mapValue);
     }
 
+    @ApiOperation(value = "查询规格型号是否正确")
+    @PostMapping("/queryFormat")
+    RESTfulResult queryFormat(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.queryFormat(mapList);
+    }
+
+    @ApiOperation(value = "查询物资ID并赋值")
+    @PostMapping("/queryMaterial")
+    RESTfulResult queryMaterial(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.queryMaterial(mapList);
+    }
+
     @ApiOperation("excel导入批量新增销售订单")
     @PostMapping("addSteelSaleOrderList")
     public Map<String,Object> addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){

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

@@ -2513,6 +2513,25 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName,supplierName);
     }
 
+    @ApiOperation(value = "查询待绑定的批次")
+    @PostMapping(value = "/findBatchForBind")
+    public Map<String, Object> findBatchForBind(@RequestBody(required = false) Map<String, Object> map,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String materialName,
+                                                     String foreignShipName){
+        if(map==null)
+            map=new HashMap<>();
+        return tmsshipFeign.findBatchForBind(map,apiId,pageNum,pageSize,materialName, foreignShipName);
+    }
+
+    @ApiOperation(value = "绑定批次")
+    @PostMapping(value = "bindBatch")
+    Map<String, Object> bindBatch(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.bindBatch(map);
+    }
+
     @ApiOperation(value = "销售钢材统计报表")
     @PostMapping("/getSaleSteelReport")
     public Map<String,Object> getSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,

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

@@ -1770,6 +1770,11 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/dilnotices/getNotice")
     RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue);
 
+    @PostMapping(value = "/api/v1/ams/amssaleorders/queryFormat")
+    RESTfulResult queryFormat(@RequestBody List<Map<String,Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/queryMaterial")
+    RESTfulResult queryMaterial(@RequestBody List<Map<String,Object>> mapList);
 
     @PostMapping("/api/v1/ams/amssaleorders/addSteelSaleOrderList")
     Map<String, Object> addSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);

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

@@ -852,4 +852,17 @@ public interface TmsshipFeign {
 
     @PostMapping(value = "/api/v1/shipTms/shipdynamics/getWagonWork")
     Map<String, Object> getWagonWork(Map<String, Object> map);
+
+    @ApiOperation(value = "查询待绑定的批次id")
+    @PostMapping(value = "api/v1/shipTms/dilbatchs/findBatchForBind")
+    Map<String, Object> findBatchForBind(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam("apiId")Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("materialName")String materialName,
+                                         @RequestParam("foreignShipName")String foreignShipName);
+
+    @ApiOperation(value = "绑定批次")
+    @PostMapping(value = "api/v1/shipTms/dilbatchs/bindBatch")
+    Map<String, Object> bindBatch(@RequestBody(required = false) Map<String, Object> map);
 }