2026-09-29

增加筛选条件

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 ('生产领料','生产退仓')
-        <where>
             <if test="transactionId != null and transactionId != ''">
-                and A.transactionId like concat('%', #{transactionId}, '%')
+                and A.transaction_id like '%' + #{transactionId} + '%'
             </if>
             <if test="documentType != null and documentType != ''">
-                and A.documentType = #{documentType}
+                and A.document_type = #{documentType}
             </if>
             <if test="rollNo != null and rollNo != ''">
-                and A.rollNo like concat('%', #{rollNo}, '%')
+                and A.roll_no like '%' + #{rollNo} + '%'
             </if>
             <if test="status != null and status != ''">
-                and A.status = #{status}
+                and B.status = #{status}
             </if>
-            <if test="consumedFlag != null and consumedFlag != ''">
-                and A.consumedFlag = #{consumedFlag}
+            <if test="consumedFlag == '已消耗'">
+                and B.consumed_flag = 'Y'
+            </if>
+            <if test="consumedFlag == '未使用'">
+                and ISNULL(B.consumed_flag, 'N') &lt;&gt; 'Y'
             </if>
-        </where>
     </select>
 
     <!-- 调用存储过程 sfdcRollsOpsReportExecute 用于打开材料卷 -->