Browse Source

2025-08-06 印版编号/PlateNo从工艺指导获取

master
fengyuan_yang 9 months ago
parent
commit
019489cb04
  1. 7
      src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
  2. 1
      src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrepressTool.java
  3. 19
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  4. 37
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

7
src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@ -1232,7 +1232,7 @@ public interface TechnicalSpecificationMapper {
void saveBMToolBatch(List<PlmBmPrepressTool> tools);
List<DictData> selectDictData(@Param("site") String site, @Param("dictType") String dictType);
List<DictData> selectDictData(@Param("site") String site, @Param("dictType") String dictType, @Param("isDefault") String isDefault);
PartSubPropertiesValueData getToolPropertiesValue(@Param("site") String site, @Param("toolId") String toolId, @Param("recordType") String recordType, @Param("dictValue") String dictValue);
@ -1267,4 +1267,9 @@ public interface TechnicalSpecificationMapper {
void saveBMSilkScreenColors(List<PlmBmSilkScreenColorData> colorList);
void updateProcessForm(PlmTechnicalSpecificationSheetData data);
void updateBMPrepressDetailPlateNo(@Param("site") String site, @Param("codeNo") String codeNo, @Param("plateNo") String guildLineText, @Param("updateBy") String updateBy);
List<WorkGuidelineVo> getRoutingGuideLineByLineDesc(@Param("site") String site, @Param("partNo") String partNo, @Param("routingRevision") Integer routingRevision,
@Param("routingType") String routingType, @Param("alternativeNo") String alternativeNo, @Param("operationId") Integer operationId, @Param("dictLabel") String dictLabel);
}

1
src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrepressTool.java

@ -62,4 +62,5 @@ public class PlmBmPrepressTool {
* 更新人
*/
private String updateBy;
private Integer operationId;
}

19
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@ -2318,7 +2318,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
no++;
// 先查数据字典确认属性 根据属性查横排数 竖排数
String dictType = "bm_prepress_tool";
List<DictData> dictDataList = technicalSpecificationMapper.selectDictData(data.getSite(), dictType);
List<DictData> dictDataList = technicalSpecificationMapper.selectDictData(data.getSite(), dictType, "");
if (dictDataList.isEmpty()) {
throw new RuntimeException("未找到字典类型:" + dictType);
}
@ -2347,7 +2347,22 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
technicalSpecificationMapper.saveBMToolBatch(tools);
// 印版号从Routing的工艺指导中导入类型是"Plate no"
// 根据site和字典类型查询字典数据 默认值
List<DictData> dictDataList = technicalSpecificationMapper.selectDictData(data.getSite(), "routing_work_guide_line", "Y");
if (dictDataList.isEmpty()) {
return;
}
// 将字典dict_label作为工艺指导名称查指导描述 如果有多条则用;拼接在一起
List<WorkGuidelineVo> lineList = technicalSpecificationMapper.getRoutingGuideLineByLineDesc(routingDetail.getSite(), routingDetail.getPartNo(), routingDetail.getRoutingRevision(), routingDetail.getRoutingType(), routingDetail.getAlternativeNo(), data.getOperationId(), dictDataList.get(0).getDictLabel());
if (lineList.isEmpty()) {
return;
}
String guildLineText = lineList.stream()
.map(WorkGuidelineVo::getGuidelineText)
.filter(StringUtils::hasText)
.collect(Collectors.joining(";"));
// 更新印版号
technicalSpecificationMapper.updateBMPrepressDetailPlateNo(data.getSite(), data.getCodeNo(), guildLineText, data.getCreateBy());
}
/**

37
src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@ -3054,9 +3054,17 @@
<select id="selectDictData" resultType="com.spring.modules.sys.entity.DictData">
SELECT
dict_label,
dict_value
dict_value,
is_default
FROM sys_dict_data
where site = #{site} and dict_type = #{dictType} and status = 'Y'
<where>
site = #{site}
and dict_type = #{dictType}
and status = 'Y'
<if test="isDefault != null and isDefault != ''">
and is_default = #{isDefault}
</if>
</where>
</select>
<select id="getToolPropertiesValue" resultType="com.spring.modules.base.data.PartSubPropertiesValueData">
@ -3276,4 +3284,29 @@
AND a.document_no = #{codeNo}
AND a.is_remark = 0
</update>
<update id="updateBMPrepressDetailPlateNo">
update plm_bm_prepress
set plateNo = #{plateNo},
update_by = #{updateBy},
update_date = GetDate()
where site = #{site} and code_no = #{codeNo}
</update>
<select id="getRoutingGuideLineByLineDesc" resultType="com.spring.modules.part.vo.WorkGuidelineVo">
SELECT
id,
site,
part_no,
routing_revision,
routing_type,
alternative_no,
operation_id,
guideline_seq,
guideline_desc,
guideline_text,
guideline_type
FROM plm_routing_work_guide
where site = #{site} and part_no = #{partNo} and routing_revision = #{routingRevision} and routing_type = #{routingType} and alternative_no = #{alternativeNo} and operation_id = #{operationId}
</select>
</mapper>
Loading…
Cancel
Save