From b93aeeb300a144c074390cb008a8b0c3c30c24b5 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Wed, 29 Jul 2026 10:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=B8=9A=E9=83=A8=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SampleProofTrackingController.java | 24 ++++ ...ProofTrackingBuProcessConfigBatchData.java | 16 +++ .../ProofTrackingBuProcessConfigData.java | 51 +++++++ .../mapper/SampleProofTrackingMapper.java | 7 + .../service/SampleProofTrackingService.java | 6 + .../impl/SampleProofTrackingServiceImpl.java | 134 ++++++++++++++++++ .../SampleProofTrackingMapper.xml | 33 +++++ 7 files changed, 271 insertions(+) create mode 100644 src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigBatchData.java create mode 100644 src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/controller/SampleProofTrackingController.java b/src/main/java/com/xujie/sys/modules/sampletracking/controller/SampleProofTrackingController.java index 0ba3aaa4..7f890a41 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/controller/SampleProofTrackingController.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/controller/SampleProofTrackingController.java @@ -3,6 +3,8 @@ package com.xujie.sys.modules.sampletracking.controller; import com.xujie.sys.common.utils.PageUtils; import com.xujie.sys.common.utils.R; import com.xujie.sys.modules.sampletracking.data.ProofTrackingBatchUpdateData; +import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigBatchData; +import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessLogData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessUpdateData; @@ -134,5 +136,27 @@ public class SampleProofTrackingController { return R.error("查询工序历史失败: " + e.getMessage()); } } + + @PostMapping("/buProcessConfig/list") + public R queryBuProcessConfig(@RequestBody ProofTrackingData data) { + try { + List rows = sampleProofTrackingService.queryBuProcessConfig(data); + return R.ok().put("rows", rows); + } catch (Exception e) { + log.error("查询事业部进度展示配置失败: {}", e.getMessage(), e); + return R.error("查询事业部进度展示配置失败: " + e.getMessage()); + } + } + + @PostMapping("/buProcessConfig/save") + public R saveBuProcessConfig(@RequestBody ProofTrackingBuProcessConfigBatchData data) { + try { + sampleProofTrackingService.saveBuProcessConfig(data); + return R.ok("事业部进度展示配置保存成功"); + } catch (Exception e) { + log.error("保存事业部进度展示配置失败: {}", e.getMessage(), e); + return R.error("保存事业部进度展示配置失败: " + e.getMessage()); + } + } } diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigBatchData.java b/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigBatchData.java new file mode 100644 index 00000000..03518743 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigBatchData.java @@ -0,0 +1,16 @@ +package com.xujie.sys.modules.sampletracking.data; + +import lombok.Data; + +import java.util.List; + +/** + * 事业部进度展示配置批量保存请求 + */ +@Data +public class ProofTrackingBuProcessConfigBatchData { + private String site; + private String updateBy; + private List rows; +} + diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java b/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java new file mode 100644 index 00000000..5c28175e --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/sampletracking/data/ProofTrackingBuProcessConfigData.java @@ -0,0 +1,51 @@ +package com.xujie.sys.modules.sampletracking.data; + +import lombok.Data; + +import java.util.List; + +/** + * 事业部进度展示配置 + */ +@Data +public class ProofTrackingBuProcessConfigData { + + /** + * 工厂 + */ + private String site; + + /** + * 事业部编码(前端直接使用 BU 下拉值) + */ + private String buNo; + + /** + * 事业部名称,仅用于前端展示 + */ + private String buDesc; + + /** + * 数据库存储的工序编码串(逗号分隔) + */ + private String processCodesCsv; + + /** + * 数据库存储字段:Y=展示全部,N=按工序编码展示 + */ + private String showAllFlag; + + /** + * 前端字段:是否展示全部工序 + */ + private Boolean showAll; + + /** + * 前端字段:可见工序编码列表 + */ + private List processCodes; + + private String createBy; + private String updateBy; +} + diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleProofTrackingMapper.java b/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleProofTrackingMapper.java index c2074e79..2d00913c 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleProofTrackingMapper.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/mapper/SampleProofTrackingMapper.java @@ -2,6 +2,7 @@ package com.xujie.sys.modules.sampletracking.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessLogData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessUpdateData; @@ -78,5 +79,11 @@ public interface SampleProofTrackingMapper { @Param("processCode") String processCode); void saveProcessLog(ProofTrackingProcessLogData data); + + List selectBuProcessConfigBySite(@Param("site") String site); + + void deleteBuProcessConfig(@Param("site") String site, @Param("buNo") String buNo); + + void insertBuProcessConfig(ProofTrackingBuProcessConfigData data); } diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/service/SampleProofTrackingService.java b/src/main/java/com/xujie/sys/modules/sampletracking/service/SampleProofTrackingService.java index 28014836..34424194 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/service/SampleProofTrackingService.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/service/SampleProofTrackingService.java @@ -3,6 +3,8 @@ package com.xujie.sys.modules.sampletracking.service; import com.xujie.sys.common.utils.PageUtils; import com.xujie.sys.common.utils.R; import com.xujie.sys.modules.sampletracking.data.ProofTrackingBatchUpdateData; +import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigBatchData; +import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessLogData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessUpdateData; @@ -33,5 +35,9 @@ public interface SampleProofTrackingService { void deleteProofTracking(ProofTrackingData data); List getProcessHistory(ProofTrackingData data); + + List queryBuProcessConfig(ProofTrackingData data); + + void saveBuProcessConfig(ProofTrackingBuProcessConfigBatchData data); } diff --git a/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java b/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java index b33f749e..c6d24d82 100644 --- a/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sampletracking/service/impl/SampleProofTrackingServiceImpl.java @@ -7,6 +7,8 @@ import com.xujie.sys.common.utils.R; import com.xujie.sys.modules.sampletracking.data.ProjectInfoTrackingData; import com.xujie.sys.modules.sampletracking.data.ProjectPartTrackingData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingBatchUpdateData; +import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigBatchData; +import com.xujie.sys.modules.sampletracking.data.ProofTrackingBuProcessConfigData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessLogData; import com.xujie.sys.modules.sampletracking.data.ProofTrackingProcessUpdateData; @@ -20,9 +22,13 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; +import java.util.Set; /** * 产品打样记录跟踪 Service 实现 @@ -31,6 +37,27 @@ import java.util.Objects; @Service public class SampleProofTrackingServiceImpl implements SampleProofTrackingService { + /** + * 工序编码白名单:用于过滤非法工序编码,避免脏数据写入配置表后导致前端渲染异常。 + */ + private static final List PROCESS_CODE_ORDER = Arrays.asList( + "rawMaterial", + "cylinderCutter", + "lamination", + "printing", + "etching", + "slittingPacking", + "bonding", + "cl60Cl822", + "spotting", + "encoding", + "dieCut", + "inspection", + "deliveryPackage" + ); + + private static final Set PROCESS_CODE_SET = new LinkedHashSet<>(PROCESS_CODE_ORDER); + @Autowired private SampleProofTrackingMapper sampleProofTrackingMapper; @@ -432,6 +459,78 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic return sampleProofTrackingMapper.getProcessHistory(data.getTrackingId(), data.getProcessCode()); } + @Override + public List queryBuProcessConfig(ProofTrackingData data) { + if (data == null || isBlank(data.getSite())) { + throw new RuntimeException("工厂不能为空"); + } + List rows = sampleProofTrackingMapper.selectBuProcessConfigBySite(data.getSite().trim()); + if (rows == null || rows.isEmpty()) { + return new ArrayList<>(); + } + rows.forEach(row -> { + List validCodes = normalizeProcessCodes(splitProcessCodes(row.getProcessCodesCsv())); + boolean showAll = !"N".equalsIgnoreCase(row.getShowAllFlag()) || validCodes.isEmpty(); + row.setShowAll(showAll); + row.setProcessCodes(showAll ? new ArrayList<>(PROCESS_CODE_ORDER) : validCodes); + }); + return rows; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveBuProcessConfig(ProofTrackingBuProcessConfigBatchData data) { + if (data == null || isBlank(data.getSite())) { + throw new RuntimeException("工厂不能为空"); + } + String site = data.getSite().trim(); + String updateBy = resolveOperateUser(data.getUpdateBy(), null); + if (data.getRows() == null || data.getRows().isEmpty()) { + throw new RuntimeException("请至少提供一条事业部配置"); + } + for (ProofTrackingBuProcessConfigData row : data.getRows()) { + if (row == null || isBlank(row.getBuNo())) { + continue; + } + String buNo = normalizeBuNo(row.getBuNo(), site); + if (isBlank(buNo)) { + continue; + } + List validCodes = normalizeProcessCodes(row.getProcessCodes()); + boolean showAll = Boolean.TRUE.equals(row.getShowAll()) + || validCodes.isEmpty() + || validCodes.size() >= PROCESS_CODE_ORDER.size(); + if (showAll) { + // 默认行为是“展示全部工序”,因此展示全部时直接删配置,避免后续工序扩展时还要同步补历史配置。 + sampleProofTrackingMapper.deleteBuProcessConfig(site, buNo); + continue; + } + ProofTrackingBuProcessConfigData saveData = new ProofTrackingBuProcessConfigData(); + saveData.setSite(site); + saveData.setBuNo(buNo); + saveData.setProcessCodesCsv(String.join(",", validCodes)); + saveData.setShowAllFlag("N"); + saveData.setCreateBy(updateBy); + saveData.setUpdateBy(updateBy); + // 受 Druid WallFilter 限制,Mapper 中不使用 IF/BEGIN 多语句块,改为服务层 delete+insert 组合保证幂等。 + sampleProofTrackingMapper.deleteBuProcessConfig(site, buNo); + sampleProofTrackingMapper.insertBuProcessConfig(saveData); + } + } + + private String normalizeBuNo(String buNo, String site) { + if (isBlank(buNo)) { + return ""; + } + String rawBuNo = buNo.trim(); + int splitIdx = rawBuNo.indexOf('_'); + if (splitIdx < 1 || splitIdx >= rawBuNo.length() - 1) { + return rawBuNo; + } + // 配置表中的BU统一存“去掉site前缀”的编码,避免跨site前缀导致同一BU配置不一致。 + return rawBuNo.substring(splitIdx + 1); + } + private void validateOneKeyData(ProofTrackingData data) { if (isBlank(data.getSite())) { throw new RuntimeException("工厂不能为空"); @@ -641,6 +740,41 @@ public class SampleProofTrackingServiceImpl implements SampleProofTrackingServic return projectNo + "-" + partNo + "-" + suffix; } + private List splitProcessCodes(String processCodesCsv) { + List rows = new ArrayList<>(); + if (isBlank(processCodesCsv)) { + return rows; + } + String[] splitRows = processCodesCsv.split(","); + for (String item : splitRows) { + if (isBlank(item)) { + continue; + } + rows.add(item.trim()); + } + return rows; + } + + private List normalizeProcessCodes(List processCodes) { + List rows = new ArrayList<>(); + if (processCodes == null || processCodes.isEmpty()) { + return rows; + } + for (String code : processCodes) { + if (isBlank(code)) { + continue; + } + String normalizedCode = code.trim(); + if (!PROCESS_CODE_SET.contains(normalizedCode)) { + continue; + } + if (!rows.contains(normalizedCode)) { + rows.add(normalizedCode); + } + } + return rows; + } + private String resolveOperateUser(String first, String second) { if (!isBlank(first)) { return first; diff --git a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml index cf7f92ed..f6ef7947 100644 --- a/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml +++ b/src/main/resources/mapper/sampletracking/SampleProofTrackingMapper.xml @@ -96,6 +96,13 @@ and t.site = #{query.site} + + and p.bu_no = CASE + WHEN CHARINDEX('_', #{query.buNo}) > 0 + THEN SUBSTRING(#{query.buNo}, CHARINDEX('_', #{query.buNo}) + 1, LEN(#{query.buNo})) + ELSE #{query.buNo} + END + and ( UPPER(p.project_no) like '%' + UPPER(#{query.projectNo}) + '%' @@ -817,5 +824,31 @@ #{changeType}, #{remark}, #{changedBy}, GETDATE()) + + + + DELETE FROM plm_proofing_bu_process_config + WHERE site = #{site} + AND bu_no = #{buNo} + + + + INSERT INTO plm_proofing_bu_process_config + (site, bu_no, process_codes, show_all, create_date, create_by, update_date, update_by) + VALUES + (#{site}, #{buNo}, #{processCodesCsv}, #{showAllFlag}, GETDATE(), #{createBy}, GETDATE(), #{updateBy}) + +