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/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);