2026-04-14

有话

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

@@ -2062,19 +2062,36 @@
     <!-- 获取领料记录 -->
     <select id="getMaterialRecordList" resultType="java.util.Map">
         select  
-            site,
-            bu_no as buNo,
-            transaction_id as transactionId,
-            document_type as documentType,
-            document_no as documentNo,
-            roll_no as rollNo,
-            roll_qty as rollQty,
-            batch_no as batchNo,
-            transaction_by as transactionBy,
-            transaction_date as transactionDate
+            A.site,
+            A.bu_no as buNo,
+            A.transaction_id as transactionId,
+            A.document_type as documentType,
+            A.document_no as documentNo,
+            A.roll_no as rollNo,
+            B.status, --标签状态
+            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)
-        where  A.site = #{site}  and A.order_no = #{orderNo}  AND part_no = #{partNo} and document_type in ('生产领料','生产退仓')
-        Order  by id 
+        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 ('生产领料','生产退仓')
+        UNION ALL
+        SELECT
+            A.site,
+            A.bu_no buNo,
+            A.orderref1 as transactionId,
+            A.orderref0 as documentType,
+            A.orderref1 as documentNo,
+            A.roll_no rollNo,
+            A.status, --标签状态
+            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 = '待入'
+
     </select>
 
     <!-- 调用存储过程 sfdcRollsOpsReportExecute 用于打开材料卷 -->