From 335c6699a22e5114dcfd65ea789077293bf6afdf Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 15 May 2026 15:52:42 +0800
Subject: [PATCH] =?UTF-8?q?2026-05-15=20RoHs=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rohs/controller/RohsController.java       | 23 +++++++++++++++++++
 .../modules/rohs/entity/RohsEntity.java       |  5 ++++
 src/main/resources/mapper/rohs/RohsMapper.xml |  3 ++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/rohs/controller/RohsController.java b/src/main/java/com/spring/modules/rohs/controller/RohsController.java
index 047ef5a8..90d74174 100644
--- a/src/main/java/com/spring/modules/rohs/controller/RohsController.java
+++ b/src/main/java/com/spring/modules/rohs/controller/RohsController.java
@@ -174,6 +174,29 @@ public class RohsController {
         return R.ok();
     }
 
+    /**
+     * 仅更新RoHs备注（不受流程节点和状态限制）
+     */
+    @PostMapping("/updateRemark")
+    @Transactional
+    public R updateRemark(@RequestBody RohsEntity rohs) {
+        if (StringUtils.isBlank(rohs.getSite()) || StringUtils.isBlank(rohs.getReferenceNo())) {
+            return R.error("工厂(site)和序列号(referenceNo)不能为空");
+        }
+        RohsEntity exists = rohsService.getDetail(rohs.getSite(), rohs.getReferenceNo());
+        if (exists == null) {
+            return R.error("未找到对应RoHs单据");
+        }
+        RohsEntity updateEntity = new RohsEntity();
+        updateEntity.setRohsRemark(StringUtils.defaultString(rohs.getRohsRemark()));
+        updateEntity.setUpdateDate(new Date());
+        updateEntity.setUpdateBy(getCurrentUserName());
+        QueryWrapper<RohsEntity> updateWrapper = new QueryWrapper<>();
+        updateWrapper.eq("site", rohs.getSite()).eq("reference_no", rohs.getReferenceNo());
+        rohsService.update(updateEntity, updateWrapper);
+        return R.ok();
+    }
+
     /**
      * 仅更新材料明细（用于编辑页签即时保存）
      */
diff --git a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
index 43da7476..bcc93f30 100644
--- a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
+++ b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
@@ -174,6 +174,11 @@ public class RohsEntity implements Serializable {
      */
     private String remark;
 
+    /**
+     * RoHs备注
+     */
+    private String rohsRemark;
+
     /**
      * 状态
      */
diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index 2c283099..e8ce5d22 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -34,6 +34,7 @@
         <result column="qualification_documents_needed" property="qualificationDocumentsNeeded" />
         <result column="test_report_including_items" property="testReportIncludingItems" />
         <result column="remark" property="remark" />
+        <result column="rohs_remark" property="rohsRemark" />
         <result column="status" property="status" />
         <result column="sgs_report_number" property="sgsReportNumber" />
         <result column="expired_date" property="expiredDate" />
@@ -76,7 +77,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        a.site, a.reference_no, a.applicant, a.application_date, a.process, a.pm, a.planned_mass_production_date, a.color, a.vendor_code, a.vendor_material_code, a.material_classify, a.other_material_classify, a.material_use_for, a.end_customer, a.project_id, a.is_macallan_material, a.need_create_number, a.npd_engineer, a.material_validity_time, a.material_validity_comments, a.need_deviation, a.technical_plan, a.wm_required_spec, a.is_fiber_material, a.material_thickness, a.buyer, a.expect_report_time, a.qualification_documents_needed, a.test_report_including_items, a.remark, a.status, a.sgs_report_number, a.expired_date, a.fiber_information, a.hsf_standard, a.hsf_approver, a.related_people, a.valid_until, a.is_meet_rohs_requirement, a.is_ah_grade, a.hsf_supplier_classification, a.material_desc, a.npd_remark, a.is_same_material_diff_size, a.ifs_part_no, a.comm_group1, a.comm_group2, a.comm_group3, a.create_date, a.create_by, a.update_date, a.update_by, a.step_id, a.reject_flag, a.reject_step_id
+        a.site, a.reference_no, a.applicant, a.application_date, a.process, a.pm, a.planned_mass_production_date, a.color, a.vendor_code, a.vendor_material_code, a.material_classify, a.other_material_classify, a.material_use_for, a.end_customer, a.project_id, a.is_macallan_material, a.need_create_number, a.npd_engineer, a.material_validity_time, a.material_validity_comments, a.need_deviation, a.technical_plan, a.wm_required_spec, a.is_fiber_material, a.material_thickness, a.buyer, a.expect_report_time, a.qualification_documents_needed, a.test_report_including_items, a.remark, a.rohs_remark, a.status, a.sgs_report_number, a.expired_date, a.fiber_information, a.hsf_standard, a.hsf_approver, a.related_people, a.valid_until, a.is_meet_rohs_requirement, a.is_ah_grade, a.hsf_supplier_classification, a.material_desc, a.npd_remark, a.is_same_material_diff_size, a.ifs_part_no, a.comm_group1, a.comm_group2, a.comm_group3, a.create_date, a.create_by, a.update_date, a.update_by, a.step_id, a.reject_flag, a.reject_step_id
     </sql>
 
     <select id="getApprovalList" resultType="com.spring.modules.change.vo.ProcessFormVo">