Browse Source

2026-04-14

优化
master
fengyuan_yang 2 months ago
parent
commit
3fc1ddb475
  1. 6
      src/main/resources/mapper/schedule/ScheduleMapper.xml

6
src/main/resources/mapper/schedule/ScheduleMapper.xml

@ -2069,13 +2069,14 @@
A.document_no as documentNo, A.document_no as documentNo,
A.roll_no as rollNo, A.roll_no as rollNo,
B.status, --标签状态 B.status, --标签状态
(CASE WHEN B.consumed_flag = 'Y' THEN '已消耗' ELSE '未使用' END) consumedFlag , --是否耗用
A.roll_qty as rollQty, A.roll_qty as rollQty,
A.batch_no as batchNo, A.batch_no as batchNo,
A.transaction_by as transactionBy, A.transaction_by as transactionBy,
A.transaction_date as transactionDate A.transaction_date as transactionDate
from StockTransactionLog A WITH(NOLOCK) from StockTransactionLog A WITH(NOLOCK)
INNER JOIN inventory_stock B WITH(NOLOCK) ON A.site = B.site AND A.roll_no = B.roll_no 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 UNION ALL
SELECT SELECT
A.site, A.site,
@ -2085,12 +2086,13 @@
A.orderref1 as documentNo, A.orderref1 as documentNo,
A.roll_no rollNo, A.roll_no rollNo,
A.status, --标签状态 A.status, --标签状态
(CASE WHEN a.consumed_flag = 'Y' THEN '已消耗' ELSE '未使用' END) consumedFlag , --是否使用
a.qty_on_hand as rollQty, a.qty_on_hand as rollQty,
a.batch_no batchNo, a.batch_no batchNo,
create_by as transactionBy , create_by as transactionBy ,
latest_in_date as transactionDate latest_in_date as transactionDate
FROM inventory_stock A WITH(NOLOCK) 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 = '待入'
</select> </select>

Loading…
Cancel
Save