修改

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

@@ -159,6 +159,8 @@ public class AMScontroller {
     public Map<String, Object> productionStatusUpdate(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.productionStatusUpdate(map);
     }
+
+
     @ApiOperation(value = "生产需求状态修改接口", notes = "生产需求状态修改接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
@@ -169,6 +171,15 @@ public class AMScontroller {
         return amsFeign.productionRequirementChange(map);
     }
 
+    @ApiOperation(value = "生产需求状态修改接口批量", notes = "生产需求状态修改接口批量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionRequirementChangeList")
+    public Map<String, Object> productionRequirementChangeList(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionRequirementChangeList(map);
+    }
+
 
     @ApiOperation(value = "展示生产需求详情")
     @ApiImplicitParams({
@@ -583,6 +594,14 @@ public class AMScontroller {
         return amsFeign.productionRequirementChanges(id,map);
     }
 
+    @ApiOperation(value = "查询派单时需要的发运单信息", notes = "查询派单时需要的发运单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planChildId", value = "json格式具体参数", required = true, dataType = "Integer")
+    })
+    @PostMapping(value = "/selectPlanChildById/{planChildId}")
+    public RESTfulResult selectPlanChildById(@PathVariable("planChildId") String planChildId) {
+        return amsFeign.selectPlanChildById(planChildId);
+    }
     @ApiOperation(value = "展示生产订单审批详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -597,6 +616,7 @@ public class AMScontroller {
                                               Integer pageSize
     ) {
         return amsFeign.getproductionRequirementworkflowList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+
     }
 
 

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

@@ -120,6 +120,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.updateTransOrder(map);
     }
 
+    @ApiOperation(value = "合并运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/mergeTransOrder")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> mergeTransOrder(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.mergeTransOrder(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

@@ -56,6 +56,10 @@ public interface AmsFeign {
     Map<String, Object> productionRequirementChange(Map<String, Object> map);
 
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChangeList")
+    Map<String, Object> productionRequirementChangeList(@RequestBody Map<String, Object> map);
+
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementUpdate")
     Map<String, Object> purchaseRequirementUpdate(Map<String, Object> map);
 
@@ -207,6 +211,9 @@ public interface AmsFeign {
     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,

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

@@ -46,6 +46,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/omstransorders/updateTransOrder")
     Map<String, Object> updateTransOrder(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/omstransorders/mergeTransOrder")
+    Map<String, Object> mergeTransOrder(@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

@@ -81,9 +81,6 @@
     <select id="getCompanyMesByLike" resultType="java.util.Map">
         select * from(
         select
-        RC.COMPANY_ID "companyId",
-        RC.COMPANY_NAME "companyName",
-        RC.COMPANY_TYPE "companyType",
         RC.SSO_ID "ssoId",
         RC.SSO_CODE "ssoCode",
         RC.COMPANY_ID "id",
@@ -92,29 +89,97 @@
             RC.COMPANY_TYPE || '-' ||
         </if>
         RC.COMPANY_NAME "label",
-        RC.COMPANY_NAME "text"
+        RC.COMPANY_NAME "text",
+        T2 ."rootCompanyId",
+        T2 ."rootCompanyName"
         from RMS_COMPANY RC
-        where DELETED = 0        )
+        LEFT JOIN (
+            SELECT "companyId",MAX("level") "rootIndex" FROM
+            (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            )
+            GROUP BY "companyId"
+        ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+        LEFT JOIN
+        (
+            SELECT
+            RC.COMPANY_ID "rootCompanyId",
+            RC.COMPANY_NAME "rootCompanyName",
+            LEVEL "level",
+            CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+            FROM
+            RMS_COMPANY RC
+            CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+        ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
         <where>
+            DELETED = 0
             <if test="companyType!=null and companyType!=''">
-                AND "companyType" = #{companyType}
+                AND RC.COMPANY_TYPE = #{companyType}
             </if>
             <if test="companyId!=null and companyId!=''">
                 AND "companyId" = #{companyId}
             </if>
             <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>
+                AND REGEXP_LIKE(RC.COMPANY_NAME, #{index})
             </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+        UNION
+            select
+            RC.SSO_ID "ssoId",
+            RC.SSO_CODE "ssoCode",
+            RC.COMPANY_ID "id",
+            RC.COMPANY_ID "value",
+            <if test="companyType==null">
+                RC.COMPANY_TYPE || '-' ||
+            </if>
+            RC.COMPANY_NAME "label",
+            RC.COMPANY_NAME "text",
+            T2 ."rootCompanyId",
+            T2 ."rootCompanyName"
+            from RMS_COMPANY RC
+            LEFT JOIN (
+                SELECT "companyId",MAX("level") "rootIndex" FROM
+                (
+                SELECT
+                RC.COMPANY_ID "rootCompanyId",
+                RC.COMPANY_NAME "rootCompanyName",
+                LEVEL "level",
+                CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+                FROM
+                RMS_COMPANY RC
+                CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+                )
+                GROUP BY "companyId"
+            ) T1 ON  T1 ."companyId" = RC .COMPANY_ID
+            LEFT JOIN
+            (
+                SELECT
+                RC.COMPANY_ID "rootCompanyId",
+                RC.COMPANY_NAME "rootCompanyName",
+                LEVEL "level",
+                CONNECT_BY_ROOT ( COMPANY_ID ) "companyId"
+                FROM
+                RMS_COMPANY RC
+                CONNECT BY PRIOR RC.PARENT_COMPANY_ID = RC.COMPANY_ID
+            ) T2 ON  T2 ."companyId" = T1 ."companyId" AND T2 ."level" = T1 ."rootIndex"
+            where RC.COMPANY_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="getMaterialTypeByLike" resultType="java.util.Map">
+        select * from(
         select * from(
         select
         MATERIAL_TYPE_ID "materialTypeId",
@@ -145,6 +210,23 @@
             </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+        UNION
+            select
+            MATERIAL_TYPE_ID "materialTypeId",
+            MATERIAL_TYPE_NAME "materialTypeName",
+            MATERIAL_TYPE_ID "id",
+            MATERIAL_TYPE_ID "value",
+            MATERIAL_TYPE_NAME "label",
+            MATERIAL_TYPE_NAME "text",
+            REMARK "remark"
+            from RMS_MATERIAL_TYPE
+            where MATERIAL_TYPE_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="getEmissionStandardByLike" resultType="java.util.Map">
         select * from (
@@ -175,9 +257,6 @@
     SELECT * FROM (
         select * from (
         select
-        OPERATION_POINT_ID "operationPointId",
-        OPERATION_POINT_NAME "operationPointName",
-        OPERATION_POINT_TYPE "operationPointType",
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
         OPERATION_POINT_NAME "label",
@@ -197,9 +276,6 @@
     )
     <if test="id!=null and id.size>0">
         UNION select
-        OPERATION_POINT_ID "operationPointId",
-        OPERATION_POINT_NAME "operationPointName",
-        OPERATION_POINT_TYPE "operationPointType",
         OPERATION_POINT_ID "id",
         OPERATION_POINT_ID "value",
         OPERATION_POINT_NAME "label",
@@ -272,7 +348,7 @@
             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 .DELETED = 0
-            <if test="orgCode!=null and orgCode !='' and roleCodes.contains('chengyunshang')">
+            <if test="orgCode!=null and orgCode !='' and roleCodes.contains('chengYunShang')">
                 AND RC.SSO_CODE = #{orgCode}
             </if>
             <if test="capacityType != null and capacityType != '' ">
@@ -525,19 +601,28 @@
         RC.MATERIAL_NAME "text"
         from RMS_MATERIAL RC
         where DELETED = 0
-        )
         <where>
             <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>
+                AND REGEXP_LIKE(RC.MATERIAL_NAME, #{index})
             </if>
         </where>
         FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+        UNION
+            select
+            RC.MATERIAL_ID "materialId",
+            RC.MATERIAL_NAME "materialName",
+            RC.MATERIAL_ID "id",
+            RC.MATERIAL_ID "value",
+            RC.MATERIAL_NAME "label",
+            RC.MATERIAL_NAME "text"
+            from RMS_MATERIAL RC
+            WHERE RC.MATERIAL_ID in
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="countTrainLoad" resultType="java.lang.Integer">
         SELECT COUNT(*)
@@ -558,10 +643,11 @@
         </where>
     </select>
     <select id="getBusinessTypeLike" resultType="java.util.Map">
+        select * from(
         select * from(
         select
-        DBT.BUSINESS_TYPE_ID  "businessTypeId",
-        DBT.BUSINESS_TYPE_ID  "id",
+        DBT.BUSINESS_TYPE_ID "businessTypeId",
+        DBT.BUSINESS_TYPE_ID "id",
         DBT.BUSINESS_TYPE_ID "value",
         DBT.BUSINESS_TYPE_NAME "text",
         DBT.BUSINESS_TYPE_NAME "businessTypeName",
@@ -576,10 +662,10 @@
                 AND REGEXP_LIKE("label", #{index})
             </if>
             <if test="businessType!=null and businessType!=''">
-                AND  "businessTypeId" = #{businessType}
+                AND "businessTypeId" = #{businessType}
             </if>
             <if test="businessScene!=null and businessScene!=''">
-                AND  "businessScene" = #{businessScene}
+                AND "businessScene" = #{businessScene}
             </if>
             <if test="transportType!=null and transportType!=''">
                 AND REGEXP_LIKE("transportType", #{transportType})
@@ -587,24 +673,40 @@
             <if test="materialTypeName!=null and materialTypeName!=''">
                 AND REGEXP_LIKE("materialTypeName", #{materialTypeName})
             </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
+        DBT.BUSINESS_TYPE_ID "businessTypeId",
+        DBT.BUSINESS_TYPE_ID "id",
+        DBT.BUSINESS_TYPE_ID "value",
+        DBT.BUSINESS_TYPE_NAME "text",
+        DBT.BUSINESS_TYPE_NAME "businessTypeName",
+        DBT.BUSINESS_SCENE "businessScene",
+        DBT.BUSINESS_TYPE_NAME "label",
+        DBT.ALTERNATE_FIELDS1 "transportType",
+        DBT.ALTERNATE_FIELDS2 "materialTypeName"
+        from DIL_BUSINESS_TYPE DBT
+        WHERE DBT.BUSINESS_TYPE_ID in
+        <foreach collection="id" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </if>
     </select>
     <select id="findTrainWeight" resultType="java.util.Map">
         <foreach collection="list" item="item"  separator=" UNION " >
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
+            OOC .ORDER_CHILD_ID "transOrderChildId",
             TWR .RESULT_ID "resultId",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
             #{item.毛重} "grossWeight"
             FROM 	OMS_TRANS_ORDER OTO
+            LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_WEIGHT_RESULT TWR
                 ON TWR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TWR.NET_WEIGHT_TIME = to_date(#{weightTime}, 'yyyymmdd')
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
@@ -621,10 +723,12 @@
     <select id="findTrainUnload" resultType="java.util.Map">
         <foreach collection="list" item="item"  separator=" UNION " >
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
+            OOC .ORDER_CHILD_ID "transOrderChildId",
             TUR .RESULT_ID "resultId",
             #{item.车号} "capacityId",
             #{item.净重} "unloadWeight"
             FROM 	OMS_TRANS_ORDER OTO
+            LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_UNLOAD_RESULT TUR
             ON TUR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TUR.UNLOAD_START_TIME = to_date(#{unloadTime}, 'yyyymmdd')
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
@@ -658,8 +762,15 @@
         FUEL_TYPE_NAME "text",
         FUEL_TYPE_NAME "label"
         FROM RMS_FUEL_TYPE
-        WHERE DELETED = 0
-        <if test="id!=null and id.size > 0 and !(index!=null and index!='')">
+        <where>
+            DELETED = 0
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE(FUEL_TYPE_NAME, #{index})
+            </if>
+        </where>
+        FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size > 0">
             UNION
             SELECT
             FUEL_TYPE_ID "fuelTypeId",
@@ -674,13 +785,6 @@
                 #{item}
             </foreach>
         </if>
-        )
-        <where>
-            <if test="index!=null and index!=''">
-                AND REGEXP_LIKE("label", #{index})
-            </if>
-        </where>
-        FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getDemandRulesCode" resultType="java.util.Map">
         SELECT * FROM (