修改

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/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

@@ -569,12 +569,14 @@
     <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
@@ -591,10 +593,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