|
|
|
@ -271,8 +271,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
/**
|
|
|
|
|
* mes提报给质量bpm系统
|
|
|
|
|
*/
|
|
|
|
|
if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")) {
|
|
|
|
|
//abnormalBill.setBpmSubmit("false");
|
|
|
|
|
/*if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")) {
|
|
|
|
|
List<String> NcCodeGroupList = (List)abnormalBill.getNcCodeDesc().stream().map((e) -> {
|
|
|
|
|
return e.split("/")[0];
|
|
|
|
|
}).collect(Collectors.toList());
|
|
|
|
@ -285,7 +284,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
|
|
|
|
|
String workflowInstanceId = JSON.parseObject(String.valueOf(bpmApiRes.getData())).getString("workflowInstanceId");
|
|
|
|
|
abnormalBill.setBpmFlowId(workflowInstanceId);
|
|
|
|
|
}
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ArrayList<AbnormalNcCode> abnormalNcCodes = new ArrayList<>();
|
|
|
|
@ -688,7 +687,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
String local = LocaleContextHolder.getLocale().getLanguage();
|
|
|
|
|
abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
|
|
|
|
|
|
|
|
|
|
if (StringUtil.isBlank(abnormalBill.getBpmSubmit())){
|
|
|
|
|
/* if (StringUtil.isBlank(abnormalBill.getBpmSubmit())){
|
|
|
|
|
AbnormalBill aBill = new AbnormalBill();
|
|
|
|
|
aBill.setAbnormalNo(abnormalBill.getAbnormalNo());
|
|
|
|
|
List<AbnormalBill> abnormalBills = this.selectList(aBill);
|
|
|
|
@ -697,7 +696,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
if (!bpmApiRes.getErrCode().equals(0)) {
|
|
|
|
|
throw BusinessException.build("BPM闭环关闭失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
if(!StringUtil.isBlank(abnormalBill.getStatus())){
|
|
|
|
|
abnormalBill.setStatus(abnormalBill.getStatus());
|
|
|
|
|