From 0cb646a8673e1079a2369ffb9d568ff1bc0fb2e2 Mon Sep 17 00:00:00 2001
From: hdka <823267011@qq.com>
Date: Mon, 11 Aug 2025 18:11:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/mapper/IndustryMaterialMapper.java   |  3 +++
 .../impl/IndustryMaterialServiceImpl.java     |  2 +-
 .../service/impl/IndustryStepServiceImpl.java |  6 +++--
 .../mapper/work/IndustryMaterialMapper.xml    | 24 +++++++++++++++++++
 .../mapper/work/IndustryTechnologyMapper.xml  |  2 +-
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/industry-system/src/main/java/com/industry/work/mapper/IndustryMaterialMapper.java b/industry-system/src/main/java/com/industry/work/mapper/IndustryMaterialMapper.java
index 110bcb85..c2895c05 100644
--- a/industry-system/src/main/java/com/industry/work/mapper/IndustryMaterialMapper.java
+++ b/industry-system/src/main/java/com/industry/work/mapper/IndustryMaterialMapper.java
@@ -92,4 +92,7 @@ public interface IndustryMaterialMapper
     List<IndustryMaterialVo> selectIndustryMaterialListAndNotFinish();
 
     List<IndustryMaterialVo> selectIndustryListRecord(IndustryMaterial industryMaterial);
+
+    void updateIndustryMaterialByBatchId(IndustryMaterial params);
+
 }
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 45adf528..f24d84c8 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
@@ -779,7 +779,7 @@ public class IndustryMaterialServiceImpl implements IIndustryMaterialService {
         IndustryMaterialVo industryMaterialVo = new IndustryMaterialVo();
         industryMaterialVo.setBatchId(industryMaterial.getBatchId());
         // 获得该批次的所有原料
-        List<IndustryMaterialVo> industryMaterialVos = industryMaterialMapper.selectIndustryMaterialList(industryMaterialVo);
+        List<IndustryMaterialVo> industryMaterialVos = industryMaterialMapper.selectAbnormalList(industryMaterialVo);
 
         // 首先查看是否有该批次的料
         if (Objects.nonNull(industryMaterialVos) && !industryMaterialVos.isEmpty()) {
diff --git a/industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java b/industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java
index 280ba2b7..b02c49a0 100644
--- a/industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java
+++ b/industry-system/src/main/java/com/industry/work/service/impl/IndustryStepServiceImpl.java
@@ -468,8 +468,10 @@ public class IndustryStepServiceImpl implements IIndustryStepService {
                 // 校验是否都存在道次 如果有一个不存在此工艺直接返回不做任何操作
                 if (industryTechnologyVos.isEmpty()) {
                     // 把状态改回去
-                    success.setState(0L);
-                    industryMaterialMapper.updateIndustryMaterial(success);
+                    IndustryMaterial params = new IndustryMaterial();
+                    params.setState(0L);
+                    params.setBatchId(success.getBatchId());
+                    industryMaterialMapper.updateIndustryMaterialByBatchId(params);
                     return Constants.NOT_HAVE_TECHNOLOGY;
                 }
 
diff --git a/industry-system/src/main/resources/mapper/work/IndustryMaterialMapper.xml b/industry-system/src/main/resources/mapper/work/IndustryMaterialMapper.xml
index c63a2bc9..f713b8fa 100644
--- a/industry-system/src/main/resources/mapper/work/IndustryMaterialMapper.xml
+++ b/industry-system/src/main/resources/mapper/work/IndustryMaterialMapper.xml
@@ -373,6 +373,30 @@
         set state=#{state}
         where id = #{materialId}
     </update>
+    <update id="updateIndustryMaterialByBatchId">
+        update industry_material
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="specification != null">specification = #{specification},</if>
+            <if test="technology != null">technology = #{technology},</if>
+            <if test="operation != null">operation = #{operation},</if>
+            <if test="diameter != null">diameter = #{diameter},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="state != null">state = #{state},</if>
+            <if test="stepSize != null">step_size = #{stepSize},</if>
+            <if test="finalWidth != null">final_width = #{finalWidth},</if>
+            <if test="finalWidth2 != null">final_width2 = #{finalWidth2},</if>
+            <if test="finalDiameter != null">final_diameter = #{finalDiameter},</if>
+            <if test="finalDiameter2 != null">final_diameter2 = #{finalDiameter2},</if>
+            <if test="weight != null">weight = #{weight},</if>
+            <if test="width != null">width = #{width},</if>
+        </trim>
+        where batch_id = #{batchId}
+    </update>
 
 
     <delete id="deleteIndustryMaterialByIds" parameterType="String">
diff --git a/industry-system/src/main/resources/mapper/work/IndustryTechnologyMapper.xml b/industry-system/src/main/resources/mapper/work/IndustryTechnologyMapper.xml
index 2324f865..8350ffc5 100644
--- a/industry-system/src/main/resources/mapper/work/IndustryTechnologyMapper.xml
+++ b/industry-system/src/main/resources/mapper/work/IndustryTechnologyMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectIndustryTechnologyList" parameterType="IndustryTechnology" resultMap="IndustryTechnologyResult">
         <include refid="selectIndustryTechnologyVo"/>
         <where>  
-            <if test="technologyId != null  and technologyId != ''"> and technology_id = #{technologyId}</if>
+            <if test="technologyId != null"> and technology_id = #{technologyId}</if>
             <if test="step != null "> and step = #{step}</if>
             <if test="reduction != null "> and reduction = #{reduction}</if>
             <if test="thicknessFront != null "> and thickness_front = #{thicknessFront}</if>