Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -1313,6 +1313,8 @@
             APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
             APC .MATERIAL_ID "materialId",
+            RM .MATERIAL_NAME "materialName",
+            RM .MATERIAL_CODE "materialCode",
             #{item.卸车日期} "unloadTime",
             #{item.车号} "capacityId",
             #{item.通知单号} "requireNumber",
@@ -1332,6 +1334,7 @@
             LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
             LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
             LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
+            LEFT JOIN RMS_MATERIAL RM ON RM .MATERIAL_ID = ARC .MATERIAL_ID
             <where>
                 OTO.DELETED != 1
                 AND 30 >= TO_NUMBER (to_date(#{item.卸车日期}, 'yyyymmdd') - TLR.LOAD_START_TIME)
@@ -1874,10 +1877,12 @@
         SELECT * FROM (
         SELECT DISTINCT
         ATR .SERIAL_NUMBER "supplementary",
+        ATR .SERIAL_NUMBER "supplementaryId",
         ATR .TRANS_REQUIREMENT_ID "id",
         ATR .TRANS_REQUIREMENT_ID "value",
         ATR .SERIAL_NUMBER "label",
-        ATR .SERIAL_NUMBER "text"
+        ATR .SERIAL_NUMBER "text",
+        'supplementaryId' "prop"
         FROM
         AMS_TRANS_REQUIREMENT ATR
         LEFT JOIN AMS_REQUIREMENT_CHILD ARC
@@ -1910,10 +1915,12 @@
             UNION
             SELECT DISTINCT
             ATR .SERIAL_NUMBER "supplementary",
+            ATR .SERIAL_NUMBER "supplementaryId",
             ATR .TRANS_REQUIREMENT_ID "id",
             ATR .TRANS_REQUIREMENT_ID "value",
             ATR .SERIAL_NUMBER "label",
-            ATR .SERIAL_NUMBER "text"
+            ATR .SERIAL_NUMBER "text",
+            'supplementaryId' "prop"
             FROM
             AMS_TRANS_REQUIREMENT ATR
             WHERE ATR .TRANS_REQUIREMENT_ID in