diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 1fc2419..da9e0be 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -2069,13 +2069,14 @@ A.document_no as documentNo, A.roll_no as rollNo, B.status, --标签状态 + (CASE WHEN B.consumed_flag = 'Y' THEN '已消耗' ELSE '未使用' END) consumedFlag , --是否耗用 A.roll_qty as rollQty, A.batch_no as batchNo, A.transaction_by as transactionBy, A.transaction_date as transactionDate from StockTransactionLog A WITH(NOLOCK) INNER JOIN inventory_stock B WITH(NOLOCK) ON A.site = B.site AND A.roll_no = B.roll_no - where A.site =#{site} and A.order_no = #{orderNo} AND part_no = #{partNo} and document_type in ('生产领料','生产退仓') + where A.site =#{site} and A.order_no = #{orderNo} AND a.part_no = #{partNo} and a.document_type in ('生产领料','生产退仓') UNION ALL SELECT A.site, @@ -2085,12 +2086,13 @@ A.orderref1 as documentNo, A.roll_no rollNo, A.status, --标签状态 + (CASE WHEN a.consumed_flag = 'Y' THEN '已消耗' ELSE '未使用' END) consumedFlag , --是否使用 a.qty_on_hand as rollQty, a.batch_no batchNo, create_by as transactionBy , latest_in_date as transactionDate FROM inventory_stock A WITH(NOLOCK) - WHERE A.site =#{site} and A.orderref1 = #{orderNo} AND part_no = #{partNo} and orderref0 ='生产退仓' AND status = '待入' + WHERE A.site =#{site} and A.orderref1 = #{orderNo} AND A.part_no = #{partNo} and a.orderref0 ='生产退仓' AND a.status = '待入'