From 8b484c769ac6ba137a3f81ec7fbc545b388abb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Mon, 6 Jul 2026 15:06:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=92=8C=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=B8=8A=E4=BC=A0SOP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xujie/modules/oss/dao/SysOssDao.java | 6 ++ .../data/QcSamplingInspectionPlanData.java | 6 +- .../sys/service/impl/SysFileServiceImpl.java | 69 +++++++++++++++++++ src/main/resources/mapper/oss/SysOssDao.xml | 67 ++++++++++++++++++ 4 files changed, 145 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/xujie/modules/oss/dao/SysOssDao.java b/src/main/java/com/xujie/modules/oss/dao/SysOssDao.java index 4daa7ca..3b723db 100644 --- a/src/main/java/com/xujie/modules/oss/dao/SysOssDao.java +++ b/src/main/java/com/xujie/modules/oss/dao/SysOssDao.java @@ -54,6 +54,12 @@ public interface SysOssDao extends BaseMapper { List searchPartSopListFather(SysOssEntity inData); + List queryPartSopList(@Param("site") String site, @Param("partNo") String partNo); + + List queryPartFamilyIds(@Param("site") String site, @Param("partNo") String partNo); + + List queryPartFamilySopList(@Param("site") String site, @Param("familyIds") List familyIds); + @Select("SELECT id, file_name" + " FROM sys_oss" + " WHERE order_ref1 = #{orderRef1} and order_ref2 = #{orderRef2}") diff --git a/src/main/java/com/xujie/modules/qms/data/QcSamplingInspectionPlanData.java b/src/main/java/com/xujie/modules/qms/data/QcSamplingInspectionPlanData.java index 4ecd091..bf6c35f 100644 --- a/src/main/java/com/xujie/modules/qms/data/QcSamplingInspectionPlanData.java +++ b/src/main/java/com/xujie/modules/qms/data/QcSamplingInspectionPlanData.java @@ -29,7 +29,7 @@ public class QcSamplingInspectionPlanData extends QueryPage { private String samplingQtyDesc; // 抽样量级别编码 - private Integer samplingQtyRankNo; + private String samplingQtyRankNo; // 抽样量级别名称 private String samplingQtyRankDesc; // 最小抽样量 @@ -202,11 +202,11 @@ public class QcSamplingInspectionPlanData extends QueryPage { this.site = site; } - public Integer getSamplingQtyRankNo() { + public String getSamplingQtyRankNo() { return samplingQtyRankNo; } - public void setSamplingQtyRankNo(Integer samplingQtyRankNo) { + public void setSamplingQtyRankNo(String samplingQtyRankNo) { this.samplingQtyRankNo = samplingQtyRankNo; } diff --git a/src/main/java/com/xujie/modules/sys/service/impl/SysFileServiceImpl.java b/src/main/java/com/xujie/modules/sys/service/impl/SysFileServiceImpl.java index 9dd244c..157bf17 100644 --- a/src/main/java/com/xujie/modules/sys/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/xujie/modules/sys/service/impl/SysFileServiceImpl.java @@ -109,6 +109,25 @@ public class SysFileServiceImpl implements SysFileService { @Override public List getInspectionFile(SysOssEntity inData) { List files1 = sysOssDao.getSysFileByOrderRef2(inData); + if (files1 == null) { + files1 = new ArrayList<>(); + } + + // 按料号追加 PartSop 文件 + if (isNotBlank(inData.getOrderRef1()) && isNotBlank(inData.getPartNo())) { + List partSopList = sysOssDao.queryPartSopList(inData.getOrderRef1(), inData.getPartNo()); + markSopDisplayRemark(partSopList, "物料SOP"); + appendUniqueFiles(files1, partSopList); + + // 读取物料分类(1/2/3级)并追加 PartFamilySop 文件 + List familyIds = sysOssDao.queryPartFamilyIds(inData.getOrderRef1(), inData.getPartNo()); + if (familyIds != null && !familyIds.isEmpty()) { + List partFamilySopList = sysOssDao.queryPartFamilySopList(inData.getOrderRef1(), familyIds); + markSopDisplayRemark(partFamilySopList, "物料分类SOP"); + appendUniqueFiles(files1, partFamilySopList); + } + } + // mes文件 这些是ckp mes里面的 不需要 // List list = sysOssDao.searchPartSopListFather(inData); // for (SysOssEntity p : list) { @@ -127,6 +146,56 @@ public class SysFileServiceImpl implements SysFileService { return files1; } + private void markSopDisplayRemark(List list, String defaultRemark) { + if (list == null || list.isEmpty()) { + return; + } + for (SysOssEntity entity : list) { + if (!isNotBlank(entity.getOrderRef3())) { + if ("物料分类SOP".equals(defaultRemark) && isNotBlank(entity.getOrderRef2())) { + entity.setOrderRef3(defaultRemark + "(" + entity.getOrderRef2() + ")"); + } else { + entity.setOrderRef3(defaultRemark); + } + } + } + } + + private void appendUniqueFiles(List target, List source) { + if (target == null || source == null || source.isEmpty()) { + return; + } + for (SysOssEntity sourceFile : source) { + if (!containsFile(target, sourceFile)) { + target.add(sourceFile); + } + } + } + + private boolean containsFile(List target, SysOssEntity file) { + if (target == null || file == null) { + return false; + } + for (SysOssEntity targetFile : target) { + if (targetFile == null) { + continue; + } + if (targetFile.getId() != null && file.getId() != null + && targetFile.getId().equals(file.getId())) { + return true; + } + if (Objects.equals(targetFile.getUrl(), file.getUrl()) + && Objects.equals(targetFile.getFileName(), file.getFileName())) { + return true; + } + } + return false; + } + + private boolean isNotBlank(String value) { + return value != null && value.trim().length() > 0; + } + protected SysUserEntity getUser() { return (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); diff --git a/src/main/resources/mapper/oss/SysOssDao.xml b/src/main/resources/mapper/oss/SysOssDao.xml index 910216a..fb1e7ad 100644 --- a/src/main/resources/mapper/oss/SysOssDao.xml +++ b/src/main/resources/mapper/oss/SysOssDao.xml @@ -120,4 +120,71 @@ Order by p.Levels, p.PartNo, (case when s.sop_type='TPI' then 0 when s.sop_type = 'SOP-ST' then 1 else 1 end) + + + + + +