Merge remote-tracking branch 'origin/master'

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

@@ -2629,12 +2629,14 @@
         LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         WHERE ASO.SALE_TYPE = 1
-        AND ASO.DELETED = 0
-        and ASM.SALE_MATERIAL_ID IS NOT NULL
-        AND TWR.RESULT_NET_WEIGHT IS NULL
-        AND ASOM.SALE_DATE_OF_RECEIPT  < sysdate
-        AND ASOM.SALE_DATE_OF_RECEIPT  > sysdate -1
-        AND ASO.INSERT_UPDATE_REMARK != '物流上传金蝶成功'
+        <if test="entryIdList == null">
+            AND ASO.DELETED = 0
+            and ASM.SALE_MATERIAL_ID IS NOT NULL
+            AND TWR.RESULT_NET_WEIGHT IS NULL
+            AND ASOM.SALE_DATE_OF_RECEIPT  &lt; sysdate
+            AND ASOM.SALE_DATE_OF_RECEIPT  > sysdate -1
+            AND ASO.INSERT_UPDATE_REMARK != '物流上传金蝶成功'
+        </if>
         <if test="remark != null" >
             and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
         </if>
@@ -2683,6 +2685,11 @@
             RSA.AREA_NAME like '%${item}%'
         </foreach>
         </if>
+        <if test="entryIdList != null">
+            and <foreach collection="entryIdList" item="item" open="(" separator="or" close=")">
+            ASM.EAS_PRIMARY_ID like '%${item}'
+        </foreach>
+        </if>
         order by ASO.SALE_ORDER_ID DESC, OO.ORDER_ID  DESC
         )
     </select>

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

@@ -722,9 +722,9 @@
     select * from (select RC.CAPACITY_NUMBER "capacityNumber",
     OO.ORDER_ID "orderId",
     OO.ORDER_NUMBER "orderNumber",
-    CONCAT(TTTR.RESULT_VALUE,RUOM.UNIT_OF_MEASURE_NAME) AS "resultTime",
+    TTTR.RESULT_VALUE AS "resultTime",
     RCT.CAPACITY_TYPE_NAME "capacityTypeName",
-    TTTR.RESULT_ABOUT_TIME "aboutTime",
+    TTTR.result_balance_time   "aboutTime",
     TTTR.INSERT_TIME "insertTime",
     RP.PERSONNEL_NAME  "personName",
     (