diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 70fe653..e67ce32 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -2132,23 +2132,24 @@ 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 a.bom_item_no = #{itemNo} and a.document_type in ('生产领料','生产退仓') - - and A.transactionId like concat('%', #{transactionId}, '%') + and A.transaction_id like '%' + #{transactionId} + '%' - and A.documentType = #{documentType} + and A.document_type = #{documentType} - and A.rollNo like concat('%', #{rollNo}, '%') + and A.roll_no like '%' + #{rollNo} + '%' - and A.status = #{status} + and B.status = #{status} - - and A.consumedFlag = #{consumedFlag} + + and B.consumed_flag = 'Y' + + + and ISNULL(B.consumed_flag, 'N') <> 'Y' -