2026-05-14

RoHs优化

src/main/java/com/spring/modules/rohs/controller/RohsController.java

@@ -30,6 +30,7 @@ import java.util.Map;
 public class RohsController {
 
     private static final String REFERENCE_NO_TRANS_TYPE = "reference_no";
+    private static final String HSF_STANDARD_CUSTOMER = "C00052";
 
     @Autowired
     private RohsService rohsService;
@@ -134,6 +135,7 @@ public class RohsController {
         if (StringUtils.isBlank(rohs.getRejectFlag())) {
             rohs.setRejectFlag("N");
         }
+        sanitizeHsfStandard(rohs);
         rohsService.save(rohs);
         rohsService.saveOrUpdateMaterials(rohs);
         return R.ok().put("referenceNo", newReferenceNo);
@@ -166,6 +168,7 @@ public class RohsController {
         QueryWrapper<RohsEntity> updateWrapper = new QueryWrapper<>();
         updateWrapper.eq("site", rohs.getSite()).eq("reference_no", rohs.getReferenceNo());
 
+        sanitizeHsfStandard(rohs);
         rohsService.update(rohs, updateWrapper);
         rohsService.saveOrUpdateMaterials(rohs);
         return R.ok();
@@ -287,4 +290,14 @@ public class RohsController {
         SysUserEntity user = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         return user == null ? "" : user.getUsername();
     }
+
+    private void sanitizeHsfStandard(RohsEntity rohs) {
+        if (rohs == null) {
+            return;
+        }
+        String endCustomer = StringUtils.trimToEmpty(rohs.getEndCustomer());
+        if (!HSF_STANDARD_CUSTOMER.equalsIgnoreCase(endCustomer)) {
+            rohs.setHsfStandard("");
+        }
+    }
 }

src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java

@@ -47,6 +47,7 @@ import static com.spring.modules.base.utils.CommonUtils.getPropertyValue;
 
 @Service("rohsService")
 public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> implements RohsService {
+    private static final String HSF_STANDARD_CUSTOMER = "C00052";
 
     @Autowired
     private SysUserDao sysUserDao;
@@ -233,6 +234,7 @@ public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> impleme
         updateEntity.setCreateBy(null);
         updateEntity.setUpdateDate(new Date());
         updateEntity.setUpdateBy(userName);
+        sanitizeHsfStandard(updateEntity);
         QueryWrapper<RohsEntity> updateWrapper = new QueryWrapper<>();
         updateWrapper.eq("site", site).eq("reference_no", referenceNo);
         this.update(updateEntity, updateWrapper);
@@ -534,4 +536,14 @@ public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> impleme
         }
         return String.valueOf(valueObj);
     }
+
+    private void sanitizeHsfStandard(RohsEntity rohs) {
+        if (rohs == null) {
+            return;
+        }
+        String endCustomer = StringUtils.trimToEmpty(rohs.getEndCustomer());
+        if (!HSF_STANDARD_CUSTOMER.equalsIgnoreCase(endCustomer)) {
+            rohs.setHsfStandard("");
+        }
+    }
 }