From e329f3a48cf0fc972f0e4441a5cd07e2de4e9035 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Wed, 16 Jul 2025 17:24:52 +0800
Subject: [PATCH] =?UTF-8?q?bug=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../industry/work/service/impl/IndustryMaterialServiceImpl.java | 2 +-
 .../src/main/resources/mapper/work/IndustryStepMapper.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java b/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java
index ebc84eb6..602bac75 100644
--- a/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java
+++ b/industry-system/src/main/java/com/industry/work/service/impl/IndustryMaterialServiceImpl.java
@@ -209,7 +209,7 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService {
                 industryStep.setBatchId(industryMaterialVo.getBatchId());
                 industryStep.setMaterialId(industryMaterialVo.getId());
                 industryStep.setState(2L);
-                List<IndustryStepVo> industryStepVos = industryStepMapper.selectIndustryStepList(industryStep);
+                List<IndustryStepVo> industryStepVos = industryStepMapper.selectErrorIndustryStepList(industryStep);
                 for (IndustryStepVo industryStepVo : industryStepVos) {
                     industryStepVo.setState(0L);
                     industryStepMapper.updateIndustryStep(industryStepVo);
diff --git a/industry-system/src/main/resources/mapper/work/IndustryStepMapper.xml b/industry-system/src/main/resources/mapper/work/IndustryStepMapper.xml
index 5b547cee..596ea1f5 100644
--- a/industry-system/src/main/resources/mapper/work/IndustryStepMapper.xml
+++ b/industry-system/src/main/resources/mapper/work/IndustryStepMapper.xml
@@ -64,7 +64,6 @@
         <include refid="selectIndustryStepVo"/>
         <where>
             <if test="step != null ">and step = #{step}</if>
-            <if test="delFlag != null">and del_flag = #{delFlag}</if>
             <if test="reduction != null ">and reduction = #{reduction}</if>
             <if test="setValue != null ">and set_value = #{setValue}</if>
             <if test="angle != null ">and angle = #{angle}</if>
@@ -72,6 +71,7 @@
             <if test="state != null ">and state = #{state}</if>
             <if test="materialId != null">and material_id = #{materialId}</if>
             <if test="batchId != null">and batch_id = #{batchId}</if>
+            <if test="delFlag != null">and del_flag = #{delFlag}</if>
         </where>
         order by step
     </select>