2026-04-30

RoHs功能

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

@@ -0,0 +1,164 @@
+package com.spring.modules.rohs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.spring.common.utils.PageUtils;
+import com.spring.common.utils.R;
+import com.spring.modules.oss.entity.SysOssEntity;
+import com.spring.modules.oss.service.SysOssService;
+import com.spring.modules.rohs.entity.RohsEntity;
+import com.spring.modules.rohs.service.RohsService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * RoHs Controller
+ */
+@RestController
+@RequestMapping("/rohs")
+public class RohsController {
+
+    @Autowired
+    private RohsService rohsService;
+
+    @Autowired
+    private SysOssService sysOssService;
+
+    /**
+     * 列表查询
+     */
+    @GetMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = rohsService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+    /**
+     * 详情查询
+     */
+    @GetMapping("/info")
+    public R info(@RequestParam("site") String site, @RequestParam("referenceNo") String referenceNo){
+        if (StringUtils.isBlank(site) || StringUtils.isBlank(referenceNo)) {
+            return R.error("工厂(site)和序列号(referenceNo)不能为空");
+        }
+        RohsEntity rohs = rohsService.getDetail(site, referenceNo);
+        return R.ok().put("data", rohs);
+    }
+
+    /**
+     * 保存
+     */
+    @PostMapping("/save")
+    @Transactional
+    public R save(@RequestBody RohsEntity rohs){
+        if (StringUtils.isBlank(rohs.getSite()) || StringUtils.isBlank(rohs.getReferenceNo())) {
+            return R.error("工厂(site)和序列号(referenceNo)不能为空");
+        }
+
+        String originalReferenceNo = rohs.getReferenceNo();
+        String newReferenceNo = originalReferenceNo;
+
+        // 方案A：如果是前端传来的临时单号，则生成真实单号 (比如：RH20260428001)
+        if (originalReferenceNo.startsWith("TEMP-")) {
+            String dateStr = new SimpleDateFormat("yyyyMMdd").format(new Date());
+            String prefix = "RH" + dateStr;
+            
+            QueryWrapper<RohsEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.likeRight("reference_no", prefix);
+            queryWrapper.orderByDesc("reference_no");
+            
+            // 为了兼容不同的数据库类型，此处通过列表方式获取第一条即为当天的最大号
+            List<RohsEntity> list = rohsService.list(queryWrapper);
+            if (list != null && !list.isEmpty()) {
+                RohsEntity lastRecord = list.get(0);
+                String lastNo = lastRecord.getReferenceNo();
+                // 判断后缀是否能提取为数字流水号
+                if (lastNo != null && lastNo.length() >= 13) {
+                    try {
+                        int seq = Integer.parseInt(lastNo.substring(10));
+                        newReferenceNo = prefix + String.format("%03d", seq + 1);
+                    } catch (NumberFormatException e) {
+                        newReferenceNo = prefix + "001";
+                    }
+                } else {
+                    newReferenceNo = prefix + "001";
+                }
+            } else {
+                newReferenceNo = prefix + "001";
+            }
+
+            // 更新到实体类上准备入库
+            rohs.setReferenceNo(newReferenceNo);
+
+            // 【关键步骤】：将所有前端上传时的临时关联ID全部更新为正式生成的单据号
+            // 约定：sys_oss.order_ref1 = site, sys_oss.order_ref2 = referenceNo
+            SysOssEntity updateOss = new SysOssEntity();
+            updateOss.setOrderRef1(rohs.getSite());
+            updateOss.setOrderRef2(newReferenceNo);
+            
+            QueryWrapper<SysOssEntity> ossWrapper = new QueryWrapper<>();
+            ossWrapper.eq("order_ref1", rohs.getSite());
+            ossWrapper.eq("order_ref2", originalReferenceNo);
+            sysOssService.update(updateOss, ossWrapper);
+            
+        } else {
+            // 如果非 TEMP- 开头，仍需要校验主键是否重复
+            RohsEntity exist = rohsService.getDetail(rohs.getSite(), rohs.getReferenceNo());
+            if (exist != null) {
+                return R.error("该序列号(referenceNo)的申请记录已存在");
+            }
+        }
+
+        if (rohs.getApplicationDate() == null) {
+            rohs.setApplicationDate(new Date());
+        }
+
+        rohsService.save(rohs);
+        return R.ok().put("referenceNo", newReferenceNo);
+    }
+
+    /**
+     * 修改
+     */
+    @PostMapping("/update")
+    public R update(@RequestBody RohsEntity rohs){
+        if (StringUtils.isBlank(rohs.getSite()) || StringUtils.isBlank(rohs.getReferenceNo())) {
+            return R.error("工厂(site)和序列号(referenceNo)不能为空");
+        }
+
+        QueryWrapper<RohsEntity> updateWrapper = new QueryWrapper<>();
+        updateWrapper.eq("site", rohs.getSite()).eq("reference_no", rohs.getReferenceNo());
+
+        rohsService.update(rohs, updateWrapper);
+        return R.ok();
+    }
+
+    /**
+     * 删除 (扩展)
+     */
+    @PostMapping("/delete")
+    @Transactional
+    public R delete(@RequestBody RohsEntity rohs){
+        if (StringUtils.isBlank(rohs.getSite()) || StringUtils.isBlank(rohs.getReferenceNo())) {
+            return R.error("工厂(site)和序列号(referenceNo)不能为空");
+        }
+        
+        QueryWrapper<RohsEntity> deleteWrapper = new QueryWrapper<>();
+        deleteWrapper.eq("site", rohs.getSite()).eq("reference_no", rohs.getReferenceNo());
+        rohsService.remove(deleteWrapper);
+        
+        // 连同关联的附件数据一并清理
+        QueryWrapper<SysOssEntity> ossWrapper = new QueryWrapper<>();
+        ossWrapper.eq("order_ref1", rohs.getReferenceNo());
+        ossWrapper.eq("order_ref2", rohs.getSite());
+        sysOssService.remove(ossWrapper);
+
+        return R.ok();
+    }
+}

src/main/java/com/spring/modules/rohs/entity/RohsEntity.java

@@ -0,0 +1,209 @@
+package com.spring.modules.rohs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * RoHs材料管理实体类
+ */
+@Data
+@TableName("plm_rohs")
+public class RohsEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工厂
+     */
+    private String site;
+
+    /**
+     * 序列号
+     */
+    private String referenceNo;
+
+    /**
+     * 申请人
+     */
+    private String applicant;
+
+    /**
+     * 申请日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date applicationDate;
+
+    /**
+     * 工艺
+     */
+    private String process;
+
+    /**
+     * 供应商
+     */
+    private String vendorCode;
+
+    /**
+     * 供应商材料编号
+     */
+    private String vendorMaterialCode;
+
+    /**
+     * 材料分类
+     */
+    private String materialClassify;
+
+    /**
+     * 其他材料分类
+     */
+    private String otherMaterialClassify;
+
+    /**
+     * 辅材用途
+     */
+    private String materialUseFor;
+
+    /**
+     * 最终客户
+     */
+    private String endCustomer;
+
+    /**
+     * 项目编码
+     */
+    private String projectId;
+
+    /**
+     * 是否是Macallan材料
+     */
+    private String isMacallanMaterial;
+
+    /**
+     * 是否需要创建300/700/900编号
+     */
+    private String needCreateNumber;
+
+    /**
+     * NPD工程师
+     */
+    private String npdEngineer;
+
+    /**
+     * 材料有效期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date materialValidityTime;
+
+    /**
+     * 材料有效期备注
+     */
+    private String materialValidityComments;
+
+    /**
+     * 是否需要偏差许可
+     */
+    private String needDeviation;
+
+    /**
+     * 技术计划
+     */
+    private String technicalPlan;
+
+    /**
+     * WM所需求规格
+     */
+    private String wmRequiredSpec;
+
+    /**
+     * 是否是Fiber材料
+     */
+    private String isFiberMaterial;
+
+    /**
+     * 材料厚度
+     */
+    private String materialThickness;
+
+    /**
+     * 采购
+     */
+    private String buyer;
+
+    /**
+     * 预计提供报告时间(个月内)
+     */
+    private Integer expectReportTime;
+
+    /**
+     * 所需审批文件
+     */
+    private String qualificationDocumentsNeeded;
+
+    /**
+     * 测试报告必测项目
+     */
+    private String testReportIncludingItems;
+
+    /**
+     * 备注说明
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * SGS报告编号
+     */
+    private String sgsReportNumber;
+
+    /**
+     * 报告有效期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date expiredDate;
+
+    /**
+     * Fiber报告信息
+     */
+    private String fiberInformation;
+
+    /**
+     * HSF标准
+     */
+    private String hsfStandard;
+
+    /**
+     * 材料是否符合RoHS要求
+     */
+    private String isMeetRohsRequirement;
+
+    /**
+     * 符合HSF供应商等级
+     */
+    private String hsfSupplierClassification;
+
+    /**
+     * 材料描述
+     */
+    private String materialDesc;
+
+    /**
+     * 现有材料不同规格
+     */
+    private String isSameMaterialDiffSize;
+
+    /**
+     * 材料IFS编号
+     */
+    private String ifsPartNo;
+}

src/main/java/com/spring/modules/rohs/mapper/RohsMapper.java

@@ -0,0 +1,12 @@
+package com.spring.modules.rohs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.spring.modules.rohs.entity.RohsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * RoHsMapper
+ */
+@Mapper
+public interface RohsMapper extends BaseMapper<RohsEntity> {
+}

src/main/java/com/spring/modules/rohs/service/RohsService.java

@@ -0,0 +1,28 @@
+package com.spring.modules.rohs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.spring.common.utils.PageUtils;
+import com.spring.modules.rohs.entity.RohsEntity;
+
+import java.util.Map;
+
+/**
+ * RoHs Service
+ */
+public interface RohsService extends IService<RohsEntity> {
+
+    /**
+     * 分页查询
+     * @param params 查询参数
+     * @return 分页数据
+     */
+    PageUtils queryPage(Map<String, Object> params);
+    
+    /**
+     * 详情查询
+     * @param site 工厂
+     * @param referenceNo 序列号
+     * @return 详情
+     */
+    RohsEntity getDetail(String site, String referenceNo);
+}

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

@@ -0,0 +1,53 @@
+package com.spring.modules.rohs.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.spring.common.utils.PageUtils;
+import com.spring.common.utils.Query;
+import com.spring.modules.rohs.entity.RohsEntity;
+import com.spring.modules.rohs.mapper.RohsMapper;
+import com.spring.modules.rohs.service.RohsService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service("rohsService")
+public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> implements RohsService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        String site = (String) params.get("site");
+        String referenceNo = (String) params.get("referenceNo");
+        String applicant = (String) params.get("applicant");
+
+        QueryWrapper<RohsEntity> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(site)) {
+            queryWrapper.eq("site", site);
+        }
+        if (StringUtils.isNotBlank(referenceNo)) {
+            queryWrapper.like("reference_no", referenceNo);
+        }
+        if (StringUtils.isNotBlank(applicant)) {
+            queryWrapper.like("applicant", applicant);
+        }
+        
+        // 默认按申请时间倒序排序
+        queryWrapper.orderByDesc("application_date");
+
+        IPage<RohsEntity> page = this.page(
+                new Query<RohsEntity>().getPage(params),
+                queryWrapper
+        );
+
+        return new PageUtils(page);
+    }
+
+    @Override
+    public RohsEntity getDetail(String site, String referenceNo) {
+        QueryWrapper<RohsEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site", site).eq("reference_no", referenceNo);
+        return this.getOne(queryWrapper);
+    }
+}

src/main/java/com/spring/modules/rohs/task/RohsCleanTask.java

@@ -0,0 +1,56 @@
+package com.spring.modules.rohs.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.spring.modules.oss.entity.SysOssEntity;
+import com.spring.modules.oss.service.SysOssService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 清理RoHs临时垃圾文件的定时任务
+ */
+@Component
+public class RohsCleanTask {
+
+    private static final Logger logger = LoggerFactory.getLogger(RohsCleanTask.class);
+
+    @Autowired
+    private SysOssService sysOssService;
+
+    /**
+     * 每天凌晨0点执行，清理创建时间超过24小时的无效临时附件记录
+     */
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void cleanTempFiles() {
+        logger.info("============== 开始清理RoHs临时垃圾附件 ==============");
+        
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        Date yesterday = calendar.getTime();
+
+        QueryWrapper<SysOssEntity> queryWrapper = new QueryWrapper<>();
+        // 查找 order_ref1 包含 TEMP- 并且创建时间在昨天之前(超过24小时)的记录
+        queryWrapper.likeRight("order_ref1", "TEMP-");
+        queryWrapper.lt("create_date", yesterday);
+
+        List<SysOssEntity> garbageList = sysOssService.list(queryWrapper);
+        if (garbageList != null && !garbageList.isEmpty()) {
+            logger.info("找到 {} 条过期临时附件，准备清理...", garbageList.size());
+            
+            // 物理删除和OSS清理依赖于您系统的文件处理策略
+            // 这里我们主要将垃圾脏数据的数据库记录删除
+            sysOssService.remove(queryWrapper);
+            
+            logger.info("============== RoHs临时垃圾附件清理完成 ==============");
+        } else {
+            logger.info("============== 没有发现过期的临时垃圾附件 ==============");
+        }
+    }
+}

src/main/resources/mapper/oss/SysOssDao.xml

@@ -6,7 +6,7 @@
 
     <select id="getSysOssEntityList" resultType="com.spring.modules.oss.vo.SysOssEntityData"
             parameterType="com.spring.modules.oss.vo.SysOssEntityData">
-        select A.id,A.url,A.create_date,A.file_name,A.new_file_name,A.created_by
+        select A.id,A.url,A.create_date,A.file_name,A.new_file_name,A.create_by
         from sys_oss A
         left join file_associate B on A.id = B.sys_oss_id
         <where>
@@ -34,14 +34,14 @@
         create_date,
         file_name,
         new_file_name,
-        created_by,
+        create_by,
         order_ref1,
         order_ref2,
         order_ref3,
         file_type,
         file_suffix,
-        file_type_code,
-        dbo.file_type_resource ( ISNULL( file_type_code, - 1 ), order_ref1, order_ref2, order_ref3 ) as order_info
+        file_type_code
+<!--        dbo.file_type_resource ( ISNULL( file_type_code, - 1 ), order_ref1, order_ref2, order_ref3 ) as order_info-->
         FROM
         sys_oss
         <where>

src/main/resources/mapper/rohs/RohsMapper.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.spring.modules.rohs.mapper.RohsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.spring.modules.rohs.entity.RohsEntity">
+        <result column="site" property="site" />
+        <result column="reference_no" property="referenceNo" />
+        <result column="applicant" property="applicant" />
+        <result column="application_date" property="applicationDate" />
+        <result column="process" property="process" />
+        <result column="vendor_code" property="vendorCode" />
+        <result column="vendor_material_code" property="vendorMaterialCode" />
+        <result column="material_classify" property="materialClassify" />
+        <result column="other_material_classify" property="otherMaterialClassify" />
+        <result column="material_use_for" property="materialUseFor" />
+        <result column="end_customer" property="endCustomer" />
+        <result column="project_id" property="projectId" />
+        <result column="is_macallan_material" property="isMacallanMaterial" />
+        <result column="need_create_number" property="needCreateNumber" />
+        <result column="npd_engineer" property="npdEngineer" />
+        <result column="material_validity_time" property="materialValidityTime" />
+        <result column="material_validity_comments" property="materialValidityComments" />
+        <result column="need_deviation" property="needDeviation" />
+        <result column="technical_plan" property="technicalPlan" />
+        <result column="wm_required_spec" property="wmRequiredSpec" />
+        <result column="is_fiber_material" property="isFiberMaterial" />
+        <result column="material_thickness" property="materialThickness" />
+        <result column="buyer" property="buyer" />
+        <result column="expect_report_time" property="expectReportTime" />
+        <result column="qualification_documents_needed" property="qualificationDocumentsNeeded" />
+        <result column="test_report_including_items" property="testReportIncludingItems" />
+        <result column="remark" property="remark" />
+        <result column="status" property="status" />
+        <result column="sgs_report_number" property="sgsReportNumber" />
+        <result column="expired_date" property="expiredDate" />
+        <result column="fiber_information" property="fiberInformation" />
+        <result column="hsf_standard" property="hsfStandard" />
+        <result column="is_meet_rohs_requirement" property="isMeetRohsRequirement" />
+        <result column="hsf_supplier_classification" property="hsfSupplierClassification" />
+        <result column="material_desc" property="materialDesc" />
+        <result column="is_same_material_diff_size" property="isSameMaterialDiffSize" />
+        <result column="ifs_part_no" property="ifsPartNo" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        site, reference_no, applicant, application_date, process, vendor_code, vendor_material_code, material_classify, other_material_classify, material_use_for, end_customer, project_id, is_macallan_material, need_create_number, npd_engineer, material_validity_time, material_validity_comments, need_deviation, technical_plan, wm_required_spec, is_fiber_material, material_thickness, buyer, expect_report_time, qualification_documents_needed, test_report_including_items, remark, status, sgs_report_number, expired_date, fiber_information, hsf_standard, is_meet_rohs_requirement, hsf_supplier_classification, material_desc, is_same_material_diff_size, ifs_part_no
+    </sql>
+
+</mapper>