修改

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

@@ -41,11 +41,35 @@ public class AMScontroller{
         return amsFeign.getPurchaseOrderList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
 
-    @ApiOperation(value="新增采购订单")
+    @ApiOperation(value="同步采购订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderSync")
     @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
     public Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map){
         return amsFeign.purchaseOrderSync(map);
     }
+
+    @ApiOperation(value="新增采购订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/purchaseOrderAdd")
+    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderAdd(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.purchaseOrderAdd(map);
+    }
+
+    @ApiOperation(value="修改采购订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/purchaseOrderUpdate")
+    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderUpdate(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.purchaseOrderUpdate(map);
+    }
+
+    @ApiOperation(value="删除采购订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/purchaseOrderDelete")
+    @LogAround(foreignKeys = {"orderId"},foreignKeyTypes = {"采购订单"})
+    public Map<String, Object> purchaseOrderDelete(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.purchaseOrderDelete(map);
+    }
 }

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

@@ -134,10 +134,9 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> getMaterialList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
-                                               Integer pageSize,
-                                               String con
+                                               Integer pageSize
     ){
-        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+        return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
     @ApiOperation(value="新增物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")

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

@@ -85,6 +85,15 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查人员")
+    @GetMapping("/getPersonnelByLike")
+    public RESTfulResult getPersonnelByLike(String index) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        List<Map<String, Object>> list = universalMapper.getPersonnelByLike(map);
+        return success(list);
+    }
+
     @ApiOperation("上传文件通用方法,返回成功后的url")
     @PostMapping("/uploadFile")
     public RESTfulResult uploadFile(MultipartRequest request) throws Exception {

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

@@ -18,6 +18,15 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amsorders/purchaseOrderSync")
     Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amsorders/purchaseOrderAdd")
+    Map<String, Object> purchaseOrderAdd(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amsorders/purchaseOrderUpdate")
+    Map<String, Object> purchaseOrderUpdate(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amsorders/purchaseOrderDelete")
+    Map<String, Object> purchaseOrderDelete(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/ams/amsorders/getPurchaseOrderList")
     Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                      @RequestParam  Integer apiId,

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

@@ -89,8 +89,7 @@ public interface RmsFeign {
     Map<String,Object> getMaterialList(@RequestBody(required = false) Map<String,Object> mapValue,
                                        @RequestParam("apiId") Integer apiId,
                                        @RequestParam("pageNum") Integer pageNum,
-                                       @RequestParam("pageSize") Integer pageSize,
-                                       @RequestParam String con);
+                                       @RequestParam("pageSize") Integer pageSize);
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
     Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -24,6 +24,8 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getOperationPointByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getPersonnelByLike(Map<String, Object> map);
+
 
     List<String> getColumnNoRoutList(Map<String, Object> map);
 
@@ -36,6 +38,4 @@ public interface UniversalMapper {
     List<Map<String, Object>> getColumnAllScheme(Map<String, Object> map);
 
     String getWlUrl();
-
-
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -108,10 +108,12 @@
     <select id="getCompanyMesByLike" resultType="java.util.Map">
         select
             RC.COMPANY_ID "companyId",
-            RC.COMPANY_NAME "value",
             RC.COMPANY_NAME "companyName",
             RC.SSO_ID "ssoId",
-            RC.SSO_CODE "ssoCode"
+            RC.SSO_CODE "ssoCode",
+            RC.COMPANY_ID "id",
+            RC.COMPANY_ID "value",
+            RC.COMPANY_NAME "label"
         from RMS_COMPANY RC
         where DELETED = 0
         <if test="companyType!=null and companyType!=''">
@@ -164,4 +166,18 @@
         </if>
         FETCH NEXT 100 ROWS ONLY
     </select>
+    <select id="getPersonnelByLike" resultType="java.util.Map">
+        select
+        PERSONNEL_ID "personnelId",
+        PERSONNEL_NAME "personnelName",
+        PERSONNEL_ID "id",
+        PERSONNEL_ID "value",
+        PERSONNEL_NAME "label"
+        from RMS_PERSONNEL
+        where DELETED = 0
+        <if test="index!=null and index!=''">
+            AND   REGEXP_LIKE(PERSONNEL_NAME, #{index})
+        </if>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
 </mapper>