Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -231,6 +231,32 @@ public class AMScontroller  extends BaseRESTfulController {
     ) {
         return amsFeign.getproductionRequirementList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value = "展示生产需求详情-大宗")
+    @PostMapping(value = "/getProductionRequirementListDz")
+    Map<String, Object> getProductionRequirementListDz(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize
+    ) {
+        return amsFeign.getProductionRequirementListDz(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "修改通知单环保状态")
+    @PostMapping(value = "/updateEnvironmentStatus")
+    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"调拨通知单"},description = "修改通知单环保状态")
+    Map<String, Object> updateEnvironmentStatus(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return amsFeign.updateEnvironmentStatus(mapValue);
+    }
+
+
+    @ApiOperation(value = "修改通知单环保状态")
+    @PostMapping(value = "/transProductRequirementFromDz")
+    @LogAround(foreignKeys = {"transRequirementId"},foreignKeyTypes = {"调拨通知单"},description = "修改通知单环保状态")
+    Map<String, Object> transProductRequirementFromDz(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return amsFeign.transProductRequirementFromDz(mapValue);
+    }
+
     @ApiOperation(value = "展示采购需求详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),

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

@@ -223,6 +223,21 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.tmstimingresultsList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "查询计时")
+    @PostMapping("/getOrderTimeList")
+    public Map<String, Object> getOrderTimeList(@RequestBody(required = false) Map<String, Object> map,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        return tmsFeign.getOrderTimeList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "查询计时")
+    @PostMapping("/getTimeList")
+    public Map<String, Object> getOrderTimeList(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.getTimeList(map);
+    }
+
     @ApiOperation(value = "修改计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/tmstimingresultsUpdate")

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

@@ -56,6 +56,20 @@ public interface AmsFeign {
                                                    @RequestParam  Integer apiId,
                                                    @RequestParam  Integer pageNum,
                                                    @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getProductionRequirementListDz")
+    Map<String, Object> getProductionRequirementListDz(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam  Integer apiId,
+                                                     @RequestParam  Integer pageNum,
+                                                     @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/updateEnvironmentStatus")
+    Map<String, Object> updateEnvironmentStatus(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/transProductRequirementFromDz")
+    Map<String, Object> transProductRequirementFromDz(@RequestBody(required=false) Map<String,Object> mapValue);
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionStatusUpdate")
     Map<String, Object> productionStatusUpdate(Map<String, Object> map);
 

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

@@ -96,6 +96,15 @@ public interface TmsFeign {
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize);
 
+    @PostMapping("api/v1/tms/tmstimingresults/getOrderTimeList")
+    Map<String, Object> getOrderTimeList(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmstimingresults/getTimeList")
+    Map<String, Object> getTimeList(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);