luobang 7 mesi fa
parent
commit
2ed890d836

+ 18 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -526,11 +526,20 @@
             RCA.REMARK1 "remark1",
             RCA.CAPACITY_NUMBER "capacityNumber",
             RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+            "capacityStatus"."capacityRemark" "capacityRemark",
             'capacityNumber' "prop"
             FROM
             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
+            LEFT JOIN (
+                SELECT DISTINCT OTO.CAPACITY_ID "capacityId",
+                                '该车存在未完成的任务,谨慎派车!'  "capacityRemark"
+                                FROM OMS_TRANS_ORDER OTO WHERE OTO.DELETED in (4,5)
+                AND OTO.INSERT_TIME + 5 > SYSDATE
+                AND OTO.BUSINESS_SCENE IN ('采购','销售')
+                AND OTO.IDENTITY_CARD IS NOT NULL
+            ) "capacityStatus" ON RCA.CAPACITY_ID = "capacityStatus"."capacityId"
             <if test="requirementSerialNumber != null and requirementSerialNumber.contains('DF')">
                 LEFT JOIN RMS_CAPACITY_DRIVER RCD ON RCD.CAPACITY_ID = RCA.CAPACITY_ID
             </if>
@@ -603,8 +612,17 @@
                 RCA.REMARK1 "remark1",
                 RCA.CAPACITY_NUMBER "capacityNumber",
                 null "capacityTypeName",
+                "capacityStatus"."capacityRemark" "capacityRemark",
                 'capacityNumber' "prop"
                 FROM RMS_CAPACITY RCA
+                LEFT JOIN (
+                SELECT DISTINCT OTO.CAPACITY_ID "capacityId",
+                '该车存在未完成的任务,谨慎派车!'  "capacityRemark"
+                FROM OMS_TRANS_ORDER OTO WHERE OTO.DELETED in (4,5)
+                AND OTO.INSERT_TIME + 5 > SYSDATE
+                AND OTO.BUSINESS_SCENE IN ('采购','销售')
+                AND OTO.IDENTITY_CARD IS NOT NULL
+                ) "capacityStatus" ON RCA.CAPACITY_ID = "capacityStatus"."capacityId"
                 WHERE RCA .CAPACITY_ID in
                 <foreach collection="id" item="item" open="(" close=")" separator=",">
                     #{item}