Browse Source

2026-09-20

iqc任务增加刀模
master
fengyuan_yang 3 days ago
parent
commit
6667c45cda
  1. 2
      src/main/java/com/heai/modules/pms/mapper/QcMapper.java
  2. 5
      src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
  3. 7
      src/main/resources/mapper/pms/QcMapper.xml

2
src/main/java/com/heai/modules/pms/mapper/QcMapper.java

@ -293,6 +293,8 @@ public interface QcMapper {
*/
int copyIQCRecordForMachineInspect(QcFAIRecordData data);
List<String> selectMachineInspectNosBySourceInspectionNo(QcFAIRecordData data);
void saveSQCRecord(QcFAIRecordData qcFAIRecordData);
IPage<QcFAIRecordData> qcIPQCInspectionSearch(Page<QcFAIRecordData> qcFAIRecordDataPage,@Param("query") QcFAIRecordData data);

5
src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java

@ -4143,6 +4143,11 @@ public class QcServiceImpl implements QcService {
if (partInformationList.isEmpty()) {
throw new RuntimeException("未查到该物料数据!");
}
List<String> machineInspectNos = qcMapper.selectMachineInspectNosBySourceInspectionNo(qcData);
if (machineInspectNos != null && !machineInspectNos.isEmpty()) {
throw new RuntimeException("检验单号 " + qcData.getInspectionNo() + " 已生成上机检验任务单【"
+ String.join("、", machineInspectNos) + "】,不允许取消审核!");
}
/*if ("G".equals(partInformationList.get(0).getControlMes())) {
throw new RuntimeException("检验单物料的管控类型为不适用,不允许取消审核 {" + qcData.getInspectionNo() + "} !");
}*/

7
src/main/resources/mapper/pms/QcMapper.xml

@ -2597,6 +2597,13 @@
WHERE inspection_no = #{inspectionNo} AND site = #{site} AND bu_no = #{buNo}
</insert>
<select id="selectMachineInspectNosBySourceInspectionNo" resultType="java.lang.String" parameterType="com.heai.modules.pms.data.QcFAIRecordData">
SELECT inspection_no
FROM qc_iqc_record
WHERE site = #{site} AND bu_no = #{buNo} AND source_inspection_no = #{inspectionNo}
ORDER BY inspection_no
</select>
<insert id="saveSQCRecord" parameterType="com.heai.modules.pms.data.QcFAIRecordData">
INSERT INTO qc_sqc_record
(inspection_no, site, bu_no, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id,

Loading…
Cancel
Save