修改

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

@@ -1215,6 +1215,7 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "匹配装车与大车实绩")
     @PostMapping("disposeMatchLoadData")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"装机数据同步"})
     public Map<String,Object> disposeMatchLoadData(@RequestBody Map<String,Object> map) {
         return tmsFeign.disposeMatchLoadData(map);
     }

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

@@ -469,4 +469,12 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiOperation(value = "查询宏瑞车辆状态")
+    @PostMapping("getInnerCapacityStatus")
+    public RESTfulResult getInnerCapacityStatus(@RequestBody(required = false) Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getInnerCapacityStatus(map);
+        return success(list);
+    }
+
+
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -132,4 +132,6 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> selectGpTzd(Map<String, Object> map);
 
+    List<Map<String, Object>> getInnerCapacityStatus(Map<String, Object> map);
+
 }

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

@@ -566,6 +566,9 @@
         RMS_CAPACITY RCA
         LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCA.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
         LEFT JOIN RMS_CAPACITY_TYPE RCT2 ON RCT2.CAPACITY_TYPE_ID = RCA.CAPACITY_TYPE_ID2
+        <if test="requirementSerialNumber != null and requirementSerialNumber.contains('DF')">
+            LEFT JOIN RMS_CAPACITY_DRIVER RCD ON RCD.CAPACITY_ID = RCA.CAPACITY_ID
+        </if>
         left join oms_trans_order oto
         on RCA.capacity_id = oto.capacity_id
         and oto.deleted between 4 and 5
@@ -605,6 +608,9 @@
         <if test="capacityId!=null and capacityId!=''">
             AND RCA .CAPACITY_ID = #{capacityId}
         </if>
+        <if test="requirementSerialNumber != null and requirementSerialNumber.contains('DF')">
+            AND RCD.deleted = 5
+        </if>
         <if test="(driverId!=null and driverId!='') or (driverId2!=null and driverId2!='')">
             ORDER BY "countNumber" DESC
         </if>
@@ -756,7 +762,7 @@
             GROUP BY CAPACITY_ID
             ) T ON T."capacityId" = RCA .CAPACITY_ID
         </if>
-        WHERE RCA .DELETED = 0
+        WHERE RCA .DELETED in (0,3)
         <if test="capacityType != null and capacityType != '' ">
             AND RCT.CAPACITY_TYPE_NAME = #{capacityType}
         </if>
@@ -1271,9 +1277,7 @@
             <if test="materialTypeName!=null and materialTypeName!=''">
                 AND REGEXP_LIKE("materialTypeName", #{materialTypeName})
             </if>
-
         </where>
-        FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size > 0">
             UNION
@@ -2209,6 +2213,7 @@
         FROM
         RMS_CAPACITY RCA
         WHERE RCA .DELETED in ( 0,3)
+        AND RCA.REMARK1 IS NOT NULL
         <if test="index!=null and index!=''">
             AND REGEXP_LIKE(
             CASE WHEN RCA.REMARK1 is null
@@ -2343,5 +2348,41 @@
     WHERE ATR.ALTERNATE_FIELDS13 = '炼钢厂产品库→高线轧钢一车间'
     AND REGEXP_LIKE(ARC.MATERIAL_NAME,'钢坯')
     </select>
-
+    <select id="getInnerCapacityStatus" resultType="java.util.Map">
+        SELECT
+            "capacityId",
+            "capacityNumber",
+            "capacityInnerNumber",
+            "status"
+        FROM
+            (
+            SELECT DISTINCT
+            RC.CAPACITY_ID "capacityId",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            RC.REMARK1 "capacityInnerNumber",
+            CASE WHEN RC.DELETED = 3 THEN
+            '维保中'
+            WHEN OTO.TRANS_ORDER_ID IS NOT NULL THEN
+            '运输中' ELSE '空闲中'
+            END "status"
+            FROM
+            RMS_CAPACITY RC
+            LEFT JOIN OMS_TRANS_ORDER OTO ON OTO.CAPACITY_ID = RC.CAPACITY_ID
+            AND OTO.DELETED IN ( 4, 5 )
+            WHERE
+            RC.REMARK1 IS NOT NULL
+            AND RC.DELETED IN ( 0, 3 )
+            )
+        <where>
+            <if test="capacityInnerNumber != null">
+                AND regexp_like("capacityInnerNumber",#{capacityInnerNumber})
+            </if>
+            <if test="capacityNumber != null">
+                AND regexp_like("capacityNumber",#{capacityNumber})
+            </if>
+        </where>
+        ORDER BY
+            decode( "status", '运输中', 0, '空闲中', 1, '维保中', 2 ) ASC,
+            "capacityInnerNumber"
+    </select>
 </mapper>