@@ -246,7 +246,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
}catch (Exception ex){
}
-// bmsTruckFeign.addDetailsOrder(orderId);
+ bmsTruckFeign.addDetailsOrder(orderId);
break;
case 2:
case 3:
@@ -2020,7 +2020,6 @@
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
WHERE ASO.SALE_TYPE = 1
AND ASO.DELETED = 0
- AND ASM.DELETED IS NULL
<if test="oneDate != null">
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') < = ASOM.SALE_DATE_OF_RECEIPT
</if>