常熟吴彦祖 1 month ago
parent
commit
cdc039eafd
  1. 4
      src/main/java/com/xujie/modules/oss/dao/SysOssDao.java
  2. 10
      src/main/java/com/xujie/modules/sys/service/impl/SysFileServiceImpl.java
  3. 35
      src/main/resources/mapper/oss/SysOssDao.xml

4
src/main/java/com/xujie/modules/oss/dao/SysOssDao.java

@ -56,6 +56,10 @@ public interface SysOssDao extends BaseMapper<SysOssEntity> {
List<SysOssEntity> queryPartSopList(@Param("site") String site, @Param("partNo") String partNo); List<SysOssEntity> queryPartSopList(@Param("site") String site, @Param("partNo") String partNo);
List<String> queryPartSkuCodesByPartNo(@Param("site") String site, @Param("partNo") String partNo);
List<SysOssEntity> queryPartSkuSopList(@Param("site") String site, @Param("skuCodes") List<String> skuCodes);
List<String> queryPartFamilyIds(@Param("site") String site, @Param("partNo") String partNo); List<String> queryPartFamilyIds(@Param("site") String site, @Param("partNo") String partNo);
List<SysOssEntity> queryPartFamilySopList(@Param("site") String site, @Param("familyIds") List<String> familyIds); List<SysOssEntity> queryPartFamilySopList(@Param("site") String site, @Param("familyIds") List<String> familyIds);

10
src/main/java/com/xujie/modules/sys/service/impl/SysFileServiceImpl.java

@ -119,6 +119,14 @@ public class SysFileServiceImpl implements SysFileService {
markSopDisplayRemark(partSopList, "物料SOP"); markSopDisplayRemark(partSopList, "物料SOP");
appendUniqueFiles(files1, partSopList); appendUniqueFiles(files1, partSopList);
// 按料号反查SKU并追加 PartSkuSop 文件
List<String> skuCodes = sysOssDao.queryPartSkuCodesByPartNo(inData.getOrderRef1(), inData.getPartNo());
if (skuCodes != null && !skuCodes.isEmpty()) {
List<SysOssEntity> partSkuSopList = sysOssDao.queryPartSkuSopList(inData.getOrderRef1(), skuCodes);
markSopDisplayRemark(partSkuSopList, "SKU-SOP");
appendUniqueFiles(files1, partSkuSopList);
}
// 读取物料分类1/2/3级并追加 PartFamilySop 文件 // 读取物料分类1/2/3级并追加 PartFamilySop 文件
List<String> familyIds = sysOssDao.queryPartFamilyIds(inData.getOrderRef1(), inData.getPartNo()); List<String> familyIds = sysOssDao.queryPartFamilyIds(inData.getOrderRef1(), inData.getPartNo());
if (familyIds != null && !familyIds.isEmpty()) { if (familyIds != null && !familyIds.isEmpty()) {
@ -152,7 +160,7 @@ public class SysFileServiceImpl implements SysFileService {
} }
for (SysOssEntity entity : list) { for (SysOssEntity entity : list) {
if (!isNotBlank(entity.getOrderRef3())) { 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() + ")"); entity.setOrderRef3(defaultRemark + "(" + entity.getOrderRef2() + ")");
} else { } else {
entity.setOrderRef3(defaultRemark); entity.setOrderRef3(defaultRemark);

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

@ -144,6 +144,41 @@
ORDER BY create_date DESC ORDER BY create_date DESC
</select> </select>
<select id="queryPartSkuCodesByPartNo" resultType="java.lang.String">
SELECT DISTINCT LTRIM(RTRIM(sku)) AS sku
FROM part
WHERE site = #{site}
AND part_no = #{partNo}
AND sku IS NOT NULL
AND LTRIM(RTRIM(sku)) != ''
</select>
<select id="queryPartSkuSopList" resultType="SysOssEntity">
SELECT
id,
url,
create_date,
file_name,
new_file_name,
created_by,
order_ref1,
order_ref2,
order_ref3,
order_ref4,
file_type,
file_suffix,
file_type_code,
order_reftype as orderReftype
FROM sys_oss
WHERE order_ref1 = #{site}
AND order_ref2 IN
<foreach collection="skuCodes" item="skuCode" open="(" separator="," close=")">
#{skuCode}
</foreach>
AND order_reftype = 'PartSkuSop'
ORDER BY create_date DESC
</select>
<select id="queryPartFamilyIds" resultType="java.lang.String"> <select id="queryPartFamilyIds" resultType="java.lang.String">
SELECT DISTINCT family_id SELECT DISTINCT family_id
FROM ( FROM (

Loading…
Cancel
Save