wilson
/
ha-mes-java
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

赫艾修改

master
shenzhouyu 3 weeks ago
parent
777d114b60
commit
c47c380ec4
2 changed files with 42 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
  2. 36
      src/main/resources/mapper/pms/QcMapper.xml

20
src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
View File

@ -1978,7 +1978,7 @@ public class QcServiceImpl implements QcService {
qcMapper.updateFAIDetailSubmitFlag(qcData);
// 修改子明细记录标识为已提交
qcMapper.updateFAISubDetailSubmitFlag(qcData);
if(StringUtils.isNotBlank(qcData.getRefInfo1())){
if(StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
inspectService.inspectForQMS(qcData.getSite(),qcData.getRefInfo1(),Integer.parseInt(qcData.getRefInfo2()),"submit",qcData.getInspectionResult(),qcData.getInspectionRemark(),user.getUsername());
}
@ -2321,7 +2321,7 @@ public class QcServiceImpl implements QcService {
qcMapper.updateFQCDetailSubmitFlag(qcData);
// 修改子明细记录标识为已提交
qcMapper.updateFQCSubDetailSubmitFlag(qcData);
if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername());
}
@ -2689,7 +2689,7 @@ public class QcServiceImpl implements QcService {
qcMapper.updateIPQCDetailSubmitFlag(qcData);
// 修改子明细记录标识为已提交
qcMapper.updateIPQCSubDetailSubmitFlag(qcData);
if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "submit", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername());
}
// 发送邮件
@ -3227,8 +3227,8 @@ public class QcServiceImpl implements QcService {
qcMapper.updateSQCDetailSubmitFlag(recordData);
qcMapper.updateSQCSubDetailSubmitFlag(recordData);
if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){
inspectService.inspectForQMS(data.getSite(), data.getRefInfo1(), Integer.parseInt(data.getRefInfo2()), "submit", data.getInspectionResult(), data.getInspectionRemark(), currentUser.getUsername());
if (StringUtils.isNotBlank(recordData.getRefInfo1()) && StringUtils.isNotBlank(recordData.getRefInfo2())){
inspectService.inspectForQMS(recordData.getSite(), recordData.getRefInfo1(), Integer.parseInt(recordData.getRefInfo2()), "submit", recordData.getInspectionResult(), recordData.getInspectionRemark(), currentUser.getUsername());
}
if ("不合格".equals(recordData.getInspectionResult())) {
@ -3777,7 +3777,7 @@ public class QcServiceImpl implements QcService {
qcMapper.updateIQCSubDetailSubmitFlag2(qcData);
// 删除相应task表的数据
qcMapper.deleteReceivingTaskByInspectionNo(qcData);
if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername());
}
}
@ -3797,7 +3797,7 @@ public class QcServiceImpl implements QcService {
qcMapper.updateFAIMasterSubmitFlag2(qcData);
qcMapper.updateFAIDetailSubmitFlag2(qcData);
qcMapper.updateFAISubDetailSubmitFlag2(qcData);
if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername());
}
}
@ -3807,7 +3807,7 @@ public class QcServiceImpl implements QcService {
qcMapper.updateIPQCMasterSubmitFlag2(qcData);
qcMapper.updateIPQCDetailSubmitFlag2(qcData);
qcMapper.updateIPQCSubDetailSubmitFlag2(qcData);
if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername());
}
}
@ -3817,7 +3817,7 @@ public class QcServiceImpl implements QcService {
qcMapper.updateFQCMasterSubmitFlag2(qcData);
qcMapper.updateFQCDetailSubmitFlag2(qcData);
qcMapper.updateFQCSubDetailSubmitFlag2(qcData);
if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername());
}
}
@ -3827,7 +3827,7 @@ public class QcServiceImpl implements QcService {
qcMapper.updatePQCMasterSubmitFlag2(qcData);
qcMapper.updatePQCDetailSubmitFlag2(qcData);
qcMapper.updatePQCSubDetailSubmitFlag2(qcData);
if (StringUtils.isNotBlank(data.getRefInfo1()) && StringUtils.isNotBlank(data.getRefInfo2())){
if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername());
}
}

36
src/main/resources/mapper/pms/QcMapper.xml
View File

@ -1887,7 +1887,14 @@
isnull(dbo.joint_name2(a.site, a.bu_no, a.inspection_no, 'responsible'), '') as responsiblePersonName,
a.pass_qty,
a.not_pass_qty,
a.batch_qualified_qty
a.batch_qualified_qty,
a.receipt_no,
a.receipt_item_no,
a.ref_info1,
a.ref_info2,
a.ref_info3,
a.ref_info4,
a.ref_info5
FROM qc_fai_record as a
left join part as d on a.site = d.site and a.bu_no = d.sourceBu and a.part_no = d.PartNo
left join sys_user as u on a.inspector_no = u.username
@ -2275,7 +2282,14 @@
isnull(dbo.joint_name2(a.site, a.bu_no, a.inspection_no, 'responsible'), '') as responsiblePersonName,
a.pass_qty,
a.not_pass_qty,
a.batch_qualified_qty
a.batch_qualified_qty,
a.receipt_no,
a.receipt_item_no,
a.ref_info1,
a.ref_info2,
a.ref_info3,
a.ref_info4,
a.ref_info5
FROM qc_ipqc_record as a
left join part as d on a.site = d.site and a.part_no = d.partNo
left join sys_user as u on a.inspector_no = u.username
@ -2669,7 +2683,14 @@
a.submit_date,
a.pass_qty,
a.not_pass_qty,
a.batch_qualified_qty
a.batch_qualified_qty,
a.receipt_no,
a.receipt_item_no,
a.ref_info1,
a.ref_info2,
a.ref_info3,
a.ref_info4,
a.ref_info5
FROM qc_iqc_record as a
left join part as d on a.site = d.site and a.bu_no = d.sourceBu and a.part_no = d.partNo
left join view_Supplier as s on a.site = s.site and a.supplier_no = s.SupplierID
@ -3409,7 +3430,14 @@
isnull(dbo.joint_name2(a.site, a.bu_no, a.inspection_no, 'responsible'), '') as responsiblePersonName,
a.pass_qty,
a.not_pass_qty,
a.batch_qualified_qty
a.batch_qualified_qty,
a.receipt_no,
a.receipt_item_no,
a.ref_info1,
a.ref_info2,
a.ref_info3,
a.ref_info4,
a.ref_info5
FROM qc_fqc_record as a
left join part as d on a.site = d.site and a.bu_no = d.sourceBu and a.part_no = d.partNo
left join sys_user as u on a.inspector_no = u.username

Write Preview
Loading…
Cancel
Save