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 3b723db..f982bf4 100644 --- a/src/main/java/com/xujie/modules/oss/dao/SysOssDao.java +++ b/src/main/java/com/xujie/modules/oss/dao/SysOssDao.java @@ -56,6 +56,10 @@ public interface SysOssDao extends BaseMapper { List queryPartSopList(@Param("site") String site, @Param("partNo") String partNo); + List queryPartSkuCodesByPartNo(@Param("site") String site, @Param("partNo") String partNo); + + List queryPartSkuSopList(@Param("site") String site, @Param("skuCodes") List skuCodes); + List queryPartFamilyIds(@Param("site") String site, @Param("partNo") String partNo); List queryPartFamilySopList(@Param("site") String site, @Param("familyIds") List familyIds); 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 157bf17..f44c713 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 @@ -119,6 +119,14 @@ public class SysFileServiceImpl implements SysFileService { markSopDisplayRemark(partSopList, "物料SOP"); appendUniqueFiles(files1, partSopList); + // 按料号反查SKU并追加 PartSkuSop 文件 + List skuCodes = sysOssDao.queryPartSkuCodesByPartNo(inData.getOrderRef1(), inData.getPartNo()); + if (skuCodes != null && !skuCodes.isEmpty()) { + List partSkuSopList = sysOssDao.queryPartSkuSopList(inData.getOrderRef1(), skuCodes); + markSopDisplayRemark(partSkuSopList, "SKU-SOP"); + appendUniqueFiles(files1, partSkuSopList); + } + // 读取物料分类(1/2/3级)并追加 PartFamilySop 文件 List familyIds = sysOssDao.queryPartFamilyIds(inData.getOrderRef1(), inData.getPartNo()); if (familyIds != null && !familyIds.isEmpty()) { @@ -152,7 +160,7 @@ public class SysFileServiceImpl implements SysFileService { } for (SysOssEntity entity : list) { if (!isNotBlank(entity.getOrderRef3())) { - if ("物料分类SOP".equals(defaultRemark) && isNotBlank(entity.getOrderRef2())) { + if (("物料分类SOP".equals(defaultRemark) || "SKU-SOP".equals(defaultRemark)) && isNotBlank(entity.getOrderRef2())) { entity.setOrderRef3(defaultRemark + "(" + entity.getOrderRef2() + ")"); } else { entity.setOrderRef3(defaultRemark); diff --git a/src/main/resources/mapper/oss/SysOssDao.xml b/src/main/resources/mapper/oss/SysOssDao.xml index fb1e7ad..20e364f 100644 --- a/src/main/resources/mapper/oss/SysOssDao.xml +++ b/src/main/resources/mapper/oss/SysOssDao.xml @@ -144,6 +144,41 @@ ORDER BY create_date DESC + + + +