1

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

@@ -591,4 +591,20 @@ public class AMScontroller {
     public RESTfulResult selectPlanChildById(@PathVariable("planChildId") String planChildId) {
         return amsFeign.selectPlanChildById(planChildId);
     }
+    @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 = "/getproductionRequirementworkflowList")
+    Map<String, Object> getproductionRequirementworkflowList(@RequestBody(required = false) Map<String, Object> map,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize
+    ) {
+        return amsFeign.getproductionRequirementworkflowList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+
+    }
 }

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

@@ -1189,6 +1189,20 @@ public class RMScontroller extends BaseRESTfulController {
     public  Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map) {
         return  rmsFeign.addapprovelines(map);
     }
+    @ApiOperation(value="更新审批流程")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"业务类型"})
+    @PostMapping("/updateapprovelines")
+    public  Map<String, Object> updateapprovelines(@RequestBody(required = false) Map<String, Object> map) {
+        return  rmsFeign.updateapprovelines(map);
+    }
+    @ApiOperation(value="删除审批流程")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"业务类型"})
+    @PostMapping("/approvelinesdelete")
+    public  Map<String, Object> approvelinesdelete(@RequestBody(required = false) Map<String, Object> map) {
+        return  rmsFeign.approvelinesdelete(map);
+    }
  @ApiOperation(value = "燃料类型")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),

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

@@ -104,6 +104,22 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.dispatchOrder(map);
     }
 
+    @ApiOperation(value = "批量派发运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/batchDispatch")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> batchDispatch(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.batchDispatch(map);
+    }
+
+    @ApiOperation(value = "修改运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/updateTransOrder")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> updateTransOrder(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.updateTransOrder(map);
+    }
+
     @ApiOperation(value = "更改运输订单状态")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/changeTransOrder")

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

@@ -206,7 +206,14 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChanges/{id}")
     Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody Map<String, Object> map);
 
+
     @PostMapping(value = "api/v1/ams/amsplanchilds/selectPlanChildById/{planChildId}")
     RESTfulResult selectPlanChildById(@PathVariable("planChildId") String planChildId);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getproductionRequirementworkflowList")
+    Map<String, Object> getproductionRequirementworkflowList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     @RequestParam  Integer apiId,
+                                                     @RequestParam  Integer pageNum,
+                                                     @RequestParam  Integer pageSize);
+
 }

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

@@ -663,6 +663,10 @@ public interface RmsFeign {
                                         @RequestParam Integer apiId);
     @PostMapping("api/v1/rms/rmsapprovelines/addapprovelines")
     Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/rms/rmsapprovelines/updateapprovelines")
+    Map<String, Object> updateapprovelines(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/rms/rmsapprovelines/approvelinesdelete")
+    Map<String, Object> approvelinesdelete(@RequestBody(required = false) Map<String, Object> map);
 
     //燃料类型
     @PostMapping(value = "api/v1/rms/rmsfueltypes/getFuelTypeList")

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

@@ -40,6 +40,12 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/omstransorders/dispatchOrder")
     Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/omstransorders/batchDispatch")
+    Map<String, Object> batchDispatch(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/tms/omstransorders/updateTransOrder")
+    Map<String, Object> updateTransOrder(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/tms/omstransorders/getTransOrderList")
     Map<String, Object> getTransOrderList(@RequestBody(required = false) Map<String, Object> map,
                                           @RequestParam Integer apiId,

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

@@ -206,6 +206,7 @@
     </if>
     </select>
     <select id="getPersonnelByLike" resultType="java.util.Map">
+    select * from (
         select * from (
         select
         PERSONNEL_ID "personnelId",
@@ -226,14 +227,25 @@
             <if test="index!=null and index!=''">
                 AND REGEXP_LIKE("label", #{index})
             </if>
-           <if test="id!=null and id.size>0 and !(index!=null and index!='')">
-                AND "id" in
-                <foreach collection="id" item="item"  open="(" close=")" separator="," >
-                    #{item}
-                </foreach>
-            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
+    )
+    <if test="id!=null and id.size>0">
+        UNION
+        select
+        PERSONNEL_ID "personnelId",
+        PERSONNEL_NAME "personnelName",
+        PERSONNEL_POST "personnelPost",
+        PERSONNEL_ID "id",
+        PERSONNEL_ID "value",
+        PERSONNEL_NAME "label",
+        PERSONNEL_NAME "text"
+        from RMS_PERSONNEL
+        WHERE PERSONNEL_ID in
+        <foreach collection="id" item="item"  open="(" close=")" separator="," >
+            #{item}
+        </foreach>
+    </if>
     </select>
     <select id="getCapacityByLike" resultType="java.util.Map">
         select * from (
@@ -257,19 +269,28 @@
             <if test="capacityType == null">
                 AND RCT.CAPACITY_TYPE_NAME != '火车'
             </if>
-        )
-        <where>
             <if test="index!=null and index!=''">
-                AND REGEXP_LIKE("label", #{index})
+                AND REGEXP_LIKE(RCA .CAPACITY_NUMBER, #{index})
             </if>
-            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
-                AND "id" in
-                <foreach collection="id" item="item"  open="(" close=")" separator="," >
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        FETCH NEXT 10 ROWS ONLY
+            FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+            UNION
+            SELECT DISTINCT
+            RCA .CAPACITY_ID "capacityId",
+            RCA .CAPACITY_ID "id",
+            RCA .CAPACITY_ID "value",
+            RCA .CAPACITY_NUMBER "label",
+            RCA .CAPACITY_NUMBER "text"
+            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
+            LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+            WHERE RCA .CAPACITY_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="getrmsrmsjobinfosBylike" resultType="java.util.Map">
         select * from(
@@ -395,6 +416,7 @@
         </if>
     </select>
     <select id="getLineByLike" resultType="java.util.Map">
+        select * from(
         select * from(
         select
         RL.LINE_ID "lineId",
@@ -428,14 +450,39 @@
             <if test="lineType!=null and lineType!=''">
                 AND REGEXP_LIKE("lineType" , #{lineType})
             </if>
-            <if test="id!=null and id.size>0 and !(index!=null and index!='')">
-                AND "id" in
-                <foreach collection="id" item="item"  open="(" close=")" separator="," >
-                    #{item}
-                </foreach>
-            </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+        UNION
+            select
+            RL.LINE_ID "lineId",
+            RL.LINE_NAME "lineName",
+            RL.LINE_ID "id",
+            RL.LINE_ID "value",
+            RL.LINE_NAME "label",
+            RL.LINE_NAME "text",
+            NVL(RL_TEMP."points",'无') "points",
+            RL.LINE_TYPE    "lineType"
+            from RMS_LINE RL
+            LEFT JOIN
+            (
+            SELECT
+            RLS .LINE_ID "lineId",
+            listagg (DISTINCT ROP .OPERATION_POINT_NAME, ',') WITHIN GROUP (ORDER BY RLS .LINE_ID) "points"
+            FROM
+            RMS_LINE_STEP RLS
+            LEFT JOIN RMS_STEP_POINT RSP
+            ON RLS .STEP_ID = RSP .STEP_ID
+            LEFT JOIN RMS_OPERATION_POINT ROP
+            ON RSP .OPERATION_POINT_ID = ROP .OPERATION_POINT_ID
+            GROUP BY RLS .LINE_ID
+            ) RL_TEMP ON RL_TEMP ."lineId" = RL .LINE_ID
+            where RL.LINE_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="getMaterialByLike" resultType="java.util.Map">
         select * from(