Merge remote-tracking branch 'origin/master'

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

@@ -2084,4 +2084,20 @@ public class AMScontroller{
         }
         return amsFeign.updateTransPrice(mapValue);
     }
+    @PostMapping("/getwz")
+    @ApiOperation(value = "查询物资")
+    public Map<String, Object> getwz(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getwz(mapValue);
+    }
+    @PostMapping("/getcargonameId")
+    @ApiOperation(value = "查询联动公式数据")
+    public Map<String, Object> getcargonameId(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getcargonameId(mapValue);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -434,5 +435,33 @@ public class QMSController extends BaseRESTfulController {
 //                                                       String con
 //    ){return qmsFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
 //    }
+    @ApiOperation(value="查看所有物资")
+    @GetMapping("/getAllModel")
+    public Map<String, Object>  getAllModel(String index){
+        return qmsFeign.getAllModel(index);
+    }
+
+    @ApiOperation(value="查看所有未轧物资")
+    @GetMapping("/getAllModelUnrolled")
+    public Map<String, Object>  getAllModelUnrolled(String index){
+        return qmsFeign.getAllModelUnrolled(index);
+    }
+
+    @ApiOperation(value="添加未轧物资")
+    @PostMapping("/addModel")
+    public Map<String, Object> addModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.addModel(mapValue);
+    }
+
+    @ApiOperation(value="修改未轧物资")
+    @PostMapping("/updateModel")
+    public Map<String, Object> updateModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.updateModel(mapValue);
+    }
 
+    @ApiOperation(value="删除未轧物资")
+    @PostMapping("/deleteModel")
+    public Map<String, Object> deleteModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.deleteModel(mapValue);
+    }
 }

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

@@ -1783,4 +1783,10 @@ public interface AmsFeign {
 
     @PostMapping("/api/v1/ams/amscontracttruckprices/updateTransPrice")
     Map<String, Object> updateTransPrice(@RequestBody Map<String, Object> mapList);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getwz")
+    Map<String, Object> getwz(@RequestBody Map<String, Object> mapList);
+
+    @PostMapping("/api/v1/ams/amscontracttruckprices/getcargonameId")
+    Map<String, Object> getcargonameId(@RequestBody Map<String, Object> mapList);
 }

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

@@ -218,5 +218,18 @@ public interface QmsFeign {
 //                                                @RequestParam("pageSize") Integer pageSize,
 //                                                @RequestParam("con")String con
 //    );
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getAllModel")
+    Map<String, Object> getAllModel(@RequestParam String index);
 
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getAllModelUnrolled")
+    Map<String, Object> getAllModelUnrolled(@RequestParam String index);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addModel")
+    Map<String, Object> addModel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateModel")
+    Map<String, Object> updateModel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/deleteModel")
+    Map<String, Object> deleteModel(@RequestBody(required=false) Map<String,Object> mapValue);
 }