Merge branch 'dev'

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

@@ -341,11 +341,11 @@ public class AMScontroller{
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId,
-                                              String con) {
+                                              String con,String sendCompId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con);
+        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con, sendCompId);
     }
 
     /**

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

@@ -1066,4 +1066,17 @@ public class RMScontroller {
         return rmsFeign.isInHere(personnelJobNumber);
     }
 
+
+    @ApiOperation(value="创建", notes="添加油品名称")
+    @ApiImplicitParam(name = "oilTypeName", value = "油品名称", required = true, dataType = "String")
+    @PostMapping(value = "/addOilType")
+    public Map<String, Object> addOilType(String oilTypeName){
+        return rmsFeign.addOilType(oilTypeName);
+    }
+
+    @ApiOperation(value="创建", notes="查询油品名称")
+    @PostMapping(value = "/oilNameSelect")
+    public Map<String, Object> oilNameSelect(){
+        return rmsFeign.oilNameSelect();
+    }
 }

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

@@ -283,7 +283,8 @@ public interface AmsFeign {
     Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId, @RequestParam String con
+                                       @RequestParam Integer apiId, @RequestParam String con,
+                                       @RequestParam String sendCompId
                                              );
 
 

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

@@ -579,4 +579,12 @@ public interface RmsFeign {
     @ApiOperation(value = "边输边查收货客户父节点")
     @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
     Integer isInHere(@RequestParam String personnelJobNumber);
+
+    @ApiOperation(value="创建", notes="添加油品名称")
+    @PostMapping(value = "api/v1/rms/rmsoilprice/addOilType")
+    Map<String, Object> addOilType(@RequestParam String oilTypeName);
+
+    @ApiOperation(value="创建", notes="查询油品名称")
+    @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
+    Map<String, Object> oilNameSelect();
 }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8