1.审核流程维护

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

@@ -572,4 +572,14 @@ public class AMScontroller {
                                   Integer pageSize) {
         return amsFeign.getMaterial(prodCode, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value = "批量生产需求状态修改接口", notes = "生产需求状态修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionRequirementChanges/{id}")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"生产需求"})
+    public Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionRequirementChanges(id,map);
+    }
 }

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

@@ -159,4 +159,20 @@ public class EMSController extends BaseRESTfulController {
 
         return emsFeign.emsdetailsordersAdd2(map);
     }
+
+    @ApiOperation(value = "详单审批")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PutMapping("/emsdetailsordersapprove/{id}")
+    public Map<String, Object> emsdetailsordersapprove(@PathVariable String id, @RequestBody(required = false) Map<String, Object> map) {
+        return emsFeign.emsdetailsordersapprove(id, map);
+    }
+
+    @ApiOperation(value = "获取异常数据总数")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping("/faildMsg")
+    public Map<String, Object> faildMsg() {
+        return emsFeign.faildMsg();
+    }
+
 }

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

@@ -1029,4 +1029,28 @@ public class RMScontroller extends BaseRESTfulController {
         return  rmsFeign.insertBusinessType(map);
     }
 
+    @ApiOperation(value = "审批流程")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getapprovelines")
+    public Map<String, Object> getrmsapprovelines(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        return rmsFeign.getrmsapprovelines(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId);
+    }
+
+    @ApiOperation(value="新增审批流程")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"业务类型"})
+    @PostMapping("/addapprovelines")
+    public  Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map) {
+        return  rmsFeign.addapprovelines(map);
+    }
+
+
 }

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

@@ -52,8 +52,6 @@ public class SystemFileController extends BaseRESTfulController {
     @Resource
     SystemFileMapper systemFileMapper;
 
-    @Autowired
-    SystemFileMapper systemFileMapper;
 
     @Autowired
     private FtpFileUtil ftpFileUtil;
@@ -158,18 +156,7 @@ public class SystemFileController extends BaseRESTfulController {
     @PostMapping("/insertFiles")
     public RESTfulResult insertFiles(String[] fileUuids, String[] fileNames, String[] fileTypes, Map<Object, MultipartFile> FileList, MultipartRequest request) throws Exception {
 
-<<<<<<< .mine
-        List<MultipartFile> files = new ArrayList<>();
-        int index = -1;
-        for (int i = 0; i < 21; i++) {
-            MultipartFile file = request.getFile("file" + i);
-            if (file != null) {
-                files.add(file);
-                if (index < 0) {
-                    index = i;
-
 
-=======
         List<MultipartFile> files  = new ArrayList<>();
         int index=-1;
         for(int j = 0 ; j < fileTypes.length ; j ++ ) {
@@ -180,7 +167,6 @@ public class SystemFileController extends BaseRESTfulController {
                     if (index < 0) {
                         index = i;
                     }
->>>>>>> .theirs
                 }
             }
         }

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

@@ -160,11 +160,8 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.syncWeightResult(map);
     }
 
-<<<<<<< .mine
 
-=======
 
->>>>>>> .theirs
     @ApiOperation(value="计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @RequestLimit()

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

@@ -203,4 +203,7 @@ public interface AmsFeign {
                               @RequestParam Integer pageNum,
                               @RequestParam Integer pageSize);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChanges/{id}")
+    Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody Map<String, Object> map);
+
 }

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

@@ -56,6 +56,12 @@ public interface EmsFeign {
 
     @PostMapping("api/v1/ems/emsdetailsorders/emsdetailsordersAdd2")
     Map<String, Object> emsdetailsordersAdd2(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/ems/emsdetailsorders/emsdetailsordersapprove/{id}")
+    Map<String, Object> emsdetailsordersapprove(@PathVariable String id,@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emsdetailsorders/faildMsg")
+    Map<String, Object> faildMsg();
 }
 
 

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

@@ -644,6 +644,13 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/dilbusinesstypes/insertBusinessType")
     Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("/api/v1/rms/rmsapprovelines/getapprovelines")
+    Map<String, Object> getrmsapprovelines(@RequestBody(required = false) Map<String, Object> mapValue, @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+    @PostMapping("api/v1/rms/rmsapprovelines/addapprovelines")
+    Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map);
 }
 
 

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

@@ -84,11 +84,13 @@ public interface TmsFeign {
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
-    Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+    Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,  @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSiz);
 
 
     @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
-    Map<String, Object> syncQualityResult(Map<String, Object> map);
+    Map<String, Object> syncQualityResult(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/tmssigninresults/signIn")
     Map<String, Object> signIn(Map<String, Object> map);

src/main/resources/application-dev.yml

@@ -51,7 +51,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:localhost:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign: