Browse Source

物料和物料分类上传SOP

master
常熟吴彦祖 4 months ago
parent
commit
8b484c769a
  1. 6
      src/main/java/com/xujie/modules/oss/dao/SysOssDao.java
  2. 6
      src/main/java/com/xujie/modules/qms/data/QcSamplingInspectionPlanData.java
  3. 69
      src/main/java/com/xujie/modules/sys/service/impl/SysFileServiceImpl.java
  4. 67
      src/main/resources/mapper/oss/SysOssDao.xml

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

@ -54,6 +54,12 @@ public interface SysOssDao extends BaseMapper<SysOssEntity> {
List<SysOssEntity> searchPartSopListFather(SysOssEntity inData); List<SysOssEntity> searchPartSopListFather(SysOssEntity inData);
List<SysOssEntity> queryPartSopList(@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);
@Select("SELECT id, file_name" + @Select("SELECT id, file_name" +
" FROM sys_oss" + " FROM sys_oss" +
" WHERE order_ref1 = #{orderRef1} and order_ref2 = #{orderRef2}") " WHERE order_ref1 = #{orderRef1} and order_ref2 = #{orderRef2}")

6
src/main/java/com/xujie/modules/qms/data/QcSamplingInspectionPlanData.java

@ -29,7 +29,7 @@ public class QcSamplingInspectionPlanData extends QueryPage {
private String samplingQtyDesc; private String samplingQtyDesc;
// 抽样量级别编码 // 抽样量级别编码
private Integer samplingQtyRankNo;
private String samplingQtyRankNo;
// 抽样量级别名称 // 抽样量级别名称
private String samplingQtyRankDesc; private String samplingQtyRankDesc;
// 最小抽样量 // 最小抽样量
@ -202,11 +202,11 @@ public class QcSamplingInspectionPlanData extends QueryPage {
this.site = site; this.site = site;
} }
public Integer getSamplingQtyRankNo() {
public String getSamplingQtyRankNo() {
return samplingQtyRankNo; return samplingQtyRankNo;
} }
public void setSamplingQtyRankNo(Integer samplingQtyRankNo) {
public void setSamplingQtyRankNo(String samplingQtyRankNo) {
this.samplingQtyRankNo = samplingQtyRankNo; this.samplingQtyRankNo = samplingQtyRankNo;
} }

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

@ -109,6 +109,25 @@ public class SysFileServiceImpl implements SysFileService {
@Override @Override
public List<SysOssEntity> getInspectionFile(SysOssEntity inData) { public List<SysOssEntity> getInspectionFile(SysOssEntity inData) {
List<SysOssEntity> files1 = sysOssDao.getSysFileByOrderRef2(inData); List<SysOssEntity> files1 = sysOssDao.getSysFileByOrderRef2(inData);
if (files1 == null) {
files1 = new ArrayList<>();
}
// 按料号追加 PartSop 文件
if (isNotBlank(inData.getOrderRef1()) && isNotBlank(inData.getPartNo())) {
List<SysOssEntity> partSopList = sysOssDao.queryPartSopList(inData.getOrderRef1(), inData.getPartNo());
markSopDisplayRemark(partSopList, "物料SOP");
appendUniqueFiles(files1, partSopList);
// 读取物料分类(1/2/3级)并追加 PartFamilySop 文件
List<String> familyIds = sysOssDao.queryPartFamilyIds(inData.getOrderRef1(), inData.getPartNo());
if (familyIds != null && !familyIds.isEmpty()) {
List<SysOssEntity> partFamilySopList = sysOssDao.queryPartFamilySopList(inData.getOrderRef1(), familyIds);
markSopDisplayRemark(partFamilySopList, "物料分类SOP");
appendUniqueFiles(files1, partFamilySopList);
}
}
// mes文件 这些是ckp mes里面的 不需要 // mes文件 这些是ckp mes里面的 不需要
// List<SysOssEntity> list = sysOssDao.searchPartSopListFather(inData); // List<SysOssEntity> list = sysOssDao.searchPartSopListFather(inData);
// for (SysOssEntity p : list) { // for (SysOssEntity p : list) {
@ -127,6 +146,56 @@ public class SysFileServiceImpl implements SysFileService {
return files1; return files1;
} }
private void markSopDisplayRemark(List<SysOssEntity> 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<SysOssEntity> target, List<SysOssEntity> source) {
if (target == null || source == null || source.isEmpty()) {
return;
}
for (SysOssEntity sourceFile : source) {
if (!containsFile(target, sourceFile)) {
target.add(sourceFile);
}
}
}
private boolean containsFile(List<SysOssEntity> 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() { protected SysUserEntity getUser() {
return (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); return (SysUserEntity) SecurityUtils.getSubject().getPrincipal();

67
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) 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)
</where> </where>
</select> </select>
<select id="queryPartSopList" 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 = #{partNo}
AND order_reftype = 'PartSop'
ORDER BY create_date DESC
</select>
<select id="queryPartFamilyIds" resultType="java.lang.String">
SELECT DISTINCT family_id
FROM (
SELECT LTRIM(RTRIM(category)) AS family_id
FROM part
WHERE site = #{site} AND part_no = #{partNo}
UNION ALL
SELECT LTRIM(RTRIM(category_level2)) AS family_id
FROM part
WHERE site = #{site} AND part_no = #{partNo}
UNION ALL
SELECT LTRIM(RTRIM(category_level3)) AS family_id
FROM part
WHERE site = #{site} AND part_no = #{partNo}
) t
WHERE family_id IS NOT NULL AND family_id != ''
</select>
<select id="queryPartFamilySopList" 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_reftype = 'PartFamilySop'
AND order_ref2 IN
<foreach collection="familyIds" item="familyId" open="(" separator="," close=")">
#{familyId}
</foreach>
ORDER BY create_date DESC
</select>
</mapper> </mapper>
Loading…
Cancel
Save