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

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

@@ -464,6 +464,23 @@ public class AMScontroller {
         return amsFeign.selectSaleContractPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
 
+
+    @ApiOperation(value="展示销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", 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 = "/selectSaleOrderPage")
+    Map<String, Object> selectSaleOrderPage(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize){
+        return amsFeign.selectSaleOrderPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+
     @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -474,6 +491,18 @@ public class AMScontroller {
         return amsFeign.productionPlanAdd(map);
     }
 
+    @ApiOperation(value = "生产计划批量新增接口", notes = "生产计划批量新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionPlanAddList")
+    public Map<String, Object> productionPlanAddList(@RequestBody Map<String, Object> map) {
+        return amsFeign.productionPlanAddList(map);
+    }
+
+
+
+
     @ApiOperation(value = "展示生产订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -620,4 +649,33 @@ public class AMScontroller {
     }
 
 
+    @ApiOperation(value="展示销售合同")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", 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 = "/getProductPlanList")
+    Map<String, Object> getProductPlanList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize){
+        return amsFeign.getProductPlanList(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+
+    @ApiOperation("停用计划")
+    @PostMapping("/deactivatedPlan")
+    Map<String,Object> deactivatedPlan(@RequestBody Map<String,Object> map) {
+        return amsFeign.deactivatedPlan(map);
+    }
+
+    @ApiOperation("需求审批详情")
+    @PostMapping("/requirementApproveDetails")
+    Map<String,Object> requirementApproveDetails(@RequestBody Map<String,Object> map) {
+        return amsFeign.requirementApproveDetails(map);
+    }
+
+
 }

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

@@ -188,7 +188,6 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value="计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
-    @RequestLimit()
     @PostMapping(value = "/startend")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计时"})
     public Map<String, Object> start(@RequestBody(required = false) Map<String, Object> map) {

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

@@ -123,6 +123,12 @@ public interface AmsFeign {
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize);
 
+    @PostMapping("api/v1/ams/amsorders/selectSaleOrderPage")
+    Map<String, Object> selectSaleOrderPage(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize);
+
    // 工资合同
    @PostMapping("api/v1/ams/amssalarycontracts/getSalaryContrac")
    Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map,@RequestParam  Integer apiId,
@@ -170,6 +176,14 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAdd")
     Map<String, Object> productionPlanAdd(@RequestBody(required = false)Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAddList")
+    Map<String, Object> productionPlanAddList(@RequestBody Map<String, Object> map);
+
+
+
+
+
     @PostMapping("api/v1/ams/amstransplans/getproductionPlanList")
     Map<String, Object> getproductionPlanList(@RequestBody(required = false) Map<String, Object> map,
                                              @RequestParam Integer apiId,
@@ -221,5 +235,16 @@ public interface AmsFeign {
                                                      @RequestParam  Integer pageSize);
 
 
+    @PostMapping(value = "api/v1/ams/amstransplans/getProductPlanList")
+    Map<String, Object> getProductPlanList(@RequestBody Map<String, Object> objectMap,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/deactivatedPlan")
+    Map<String, Object> deactivatedPlan(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/requirementApproveDetails")
+    Map<String, Object> requirementApproveDetails(@RequestBody Map<String, Object> map);
 
 }

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

@@ -99,7 +99,8 @@
         RC.COMPANY_NAME "label",
         RC.COMPANY_NAME "text",
         T2 ."rootCompanyId",
-        T2 ."rootCompanyName"
+        T2 ."rootCompanyName",
+        'label' "prop"
         from RMS_COMPANY RC
         LEFT JOIN (
             SELECT "companyId",MAX("level") "rootIndex" FROM
@@ -134,6 +135,9 @@
             <if test="companyId!=null and companyId!=''">
                 AND RC.COMPANY_ID = #{companyId}
             </if>
+            <if test="businessCompanyId!=null and businessCompanyId!=''">
+                AND RC.COMPANY_ID = #{businessCompanyId}
+            </if>
             <if test="carrierId!=null and carrierId!=''">
                 AND RC.COMPANY_ID = #{carrierId}
             </if>
@@ -165,7 +169,8 @@
             RC.COMPANY_NAME "label",
             RC.COMPANY_NAME "text",
             T2 ."rootCompanyId",
-            T2 ."rootCompanyName"
+            T2 ."rootCompanyName",
+            'label' "prop"
             from RMS_COMPANY RC
             LEFT JOIN (
                 SELECT "companyId",MAX("level") "rootIndex" FROM
@@ -220,7 +225,7 @@
                 AND REGEXP_LIKE("remark", #{remark})
             </if>
             <if test="materialTypeId!=null and materialTypeId!=''">
-                AND REGEXP_LIKE("materialTypeId", #{materialTypeId})
+                AND "materialTypeId" =  #{materialTypeId}
             </if>
            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
@@ -287,10 +292,10 @@
                 AND REGEXP_LIKE(OPERATION_POINT_TYPE, #{operationPointType})
             </if>
             <if test="receivingPointId!=null and receivingPointId!=''">
-                AND REGEXP_LIKE("id", #{receivingPointId})
+                AND OPERATION_POINT_ID = #{receivingPointId}
             </if>
             <if test="shippingPointId!=null and shippingPointId!=''">
-                AND REGEXP_LIKE("id", #{shippingPointId})
+                AND OPERATION_POINT_ID =  #{shippingPointId}
             </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE(OPERATION_POINT_NAME, #{index})
@@ -332,7 +337,13 @@
                 AND "personnelPost" = #{personnelPost}
             </if>
             <if test="personnelId!=null and personnelId!=''">
-                AND REGEXP_LIKE("personnelId", #{personnelId})
+                AND "personnelId" = #{personnelId})
+            </if>
+            <if test="driverId!=null and driverId!=''">
+                AND "personnelId" = #{driverId})
+            </if>
+            <if test="driverId2!=null and driverId2!=''">
+                AND "personnelId" = #{driverId2})
             </if>
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
@@ -346,10 +357,12 @@
         PERSONNEL_ID "personnelId",
         PERSONNEL_NAME "personnelName",
         PERSONNEL_POST "personnelPost",
+        PERSONNEL_PHONE "personnelPhone",
         PERSONNEL_ID "id",
         PERSONNEL_ID "value",
         PERSONNEL_NAME "label",
-        PERSONNEL_NAME "text"
+        PERSONNEL_NAME "text",
+        'personnelName' "prop"
         from RMS_PERSONNEL
         WHERE PERSONNEL_ID in
         <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -385,7 +398,7 @@
                 AND REGEXP_LIKE(RCA .CAPACITY_NUMBER, #{index})
             </if>
             <if test="capacityId!=null and capacityId!=''">
-                AND REGEXP_LIKE(RCA .CAPACITY_ID, #{capacityId})
+                AND RCA .CAPACITY_ID = #{capacityId}
             </if>
             <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND RCA .CAPACITY_ID in
@@ -402,7 +415,9 @@
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
             RCA .CAPACITY_NUMBER "label",
-            RCA .CAPACITY_NUMBER "text"
+            RCA .CAPACITY_NUMBER "text",
+            RCA.CAPACITY_NUMBER "capacityNumber",
+            'capacityNumber' "prop"
             FROM RMS_CAPACITY RCA
             LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
             LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
@@ -457,7 +472,7 @@
                 AND REGEXP_LIKE("label", #{index})
             </if>
             <if test="transrangeId!=null and transrangeId!=''">
-                AND REGEXP_LIKE("transrangeId", #{transrangeId})
+                AND "transrangeId" =  #{transrangeId}
             </if>
             <if test="id!=null and id.size>0 and !(index!=null and index!='')">
                 AND "id" in
@@ -514,7 +529,7 @@
                 AND REGEXP_LIKE(RCT.CAPACITY_TYPE_NAME, #{index})
             </if>
             <if test="capacityTypeId!=null and capacityTypeId!=''">
-                AND REGEXP_LIKE(RCT.CAPACITY_TYPE_ID, #{capacityTypeId})
+                AND RCT.CAPACITY_TYPE_ID =  #{capacityTypeId}
             </if>
         </where>
         GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
@@ -575,7 +590,7 @@
                 AND REGEXP_LIKE("label" || "points", #{index})
             </if>
             <if test="lineId!=null and lineId!=''">
-                AND REGEXP_LIKE("lineId" , #{lineId})
+                AND "lineId" = #{lineId}
             </if>
             <if test="lineType!=null and lineType!=''">
                 AND REGEXP_LIKE("lineType" , #{lineType})