Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

异常系统对接v2

Browse Source
master
yinq 2 years ago
parent b4a1e85141
commit 6876d993aa
2 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File

6
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
Unescape Escape View File

@ -410,13 +410,13 @@ public class AbnormalBillController {
abnormalBill.setType("Z");
abnormalBill.setReportFrom("J");
abnormalBill.setItemBo(HandleEnum.ITEM.getHandle(site,abnormalBill.getItemBo(),"A"));
abnormalBill.setReportSendUserGroup("BPM");
abnormalBill.setReportSendUserGroup("bpmUserGroup");
abnormalBill.setSite(site);
abnormalBill.setPbUser(abnormalBill.getPbUser());
abnormalBill.setResponseUser(abnormalBill.getPbUser());
abnormalBill.setResponseDateTime(now);
abnormalBillDispose.setSite(site);
com.foreverwin.modular.core.util.CommonMethods.setUser("BPM_USER");
com.foreverwin.modular.core.util.CommonMethods.setUser(abnormalBill.getPbUser());
abnormalBillService.anomalyReport(abnormalBill, abnormalBillDispose,
ncCodesVO.getNcGroupAndNcCodes(), ncCodesVO.getDutyCauseType(), ncCodesVO.getDutyType());
return new ResultVo(ResultCode.SUCCESS,abnormalBill);
@ -443,7 +443,7 @@ public class AbnormalBillController {
try{
abnormalBill.setHandle(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo()));
//abnormalBill.setBpmSubmit("true");
abnormalBill.setBpmSubmit("true");
abnormalBill.setItemBo(HandleEnum.ITEM.getHandle(site,abnormalBill.getItemBo(),"A"));
abnormalBillService.programConfirm(abnormalBill,abnormalBillDispose);
return new ResultVo(ResultCode.SUCCESS,"BPM方案确认回传成功");

67
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.foreverwin.mesnac.anomaly.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -274,21 +275,35 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
/**
* mes提报给质量bpm系统
*/
// if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")) {
// //abnormalBill.setBpmSubmit("false");
// List<String> NcCodeGroupList = (List)abnormalBill.getNcCodeDesc().stream().map((e) -> {
// return e.split("/")[0];
// }).collect(Collectors.toList());
// abnormalBill.setPbUser(CommonMethods.getUser());
// YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBill, abnormalBillDispose,
// String.join(";", NcCodeGroupList), String.join(";", abnormalBill.getNcCodeDesc()));
// if (!bpmApiRes.getErrCode().equals(0)) {
// throw new BaseException("MES提报给质量BPM系统失败");
// }
//
// String workflowInstanceId = JSON.parseObject(String.valueOf(bpmApiRes.getData())).getString("workflowInstanceId");
// abnormalBill.setBpmFlowId(workflowInstanceId);
// }
/* if (!StringUtil.isBlank(abnormalBill.getBpmSubmit()) && abnormalBill.getBpmSubmit().equals("false")) {
//产品类别
String productCategory = abnormalBill.getProductCategory();
DataField dataField = new DataField();
dataField.setDataField("PRODUCT_CATEGORY");
List<DataField> productCategoryList = dataFieldListService.findDataFieldListById(dataField);
for (int i = 0; i < productCategoryList.size(); i++) {
String dataValue = JSONArray.toJSONString(productCategoryList.get(i));
HashMap<String,String> fieldMap = JSON.parseObject(dataValue, HashMap.class);
if (fieldMap.get("dataValue").equals(abnormalBill.getProductCategory())){
abnormalBill.setProductCategory(fieldMap.get("description"));
}
}
List<String> NcCodeGroupList = (List)abnormalBill.getNcCodeDesc().stream().map((e) -> {
return e.split("/")[0];
}).collect(Collectors.toList());
abnormalBill.setPbUser(CommonMethods.getUser());
YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBill, abnormalBillDispose,
String.join(";", NcCodeGroupList), String.join(";", abnormalBill.getNcCodeDesc()));
if (!bpmApiRes.getErrCode().equals(0)) {
throw new BaseException("MES提报给质量BPM系统失败");
}
String workflowInstanceId = JSON.parseObject(String.valueOf(bpmApiRes.getData())).getString("workflowInstanceId");
abnormalBill.setBpmFlowId(workflowInstanceId);
abnormalBill.setProductCategory(productCategory);
//abnormalBill.setStatus(Constants.RESPONSE);
//abnormalBill.setResponseUser(CommonMethods.getUser());
//abnormalBill.setResponseDateTime(now);
}*/
ArrayList<AbnormalNcCode> abnormalNcCodes = new ArrayList<>();
@ -333,7 +348,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
//发送消息
if(Constants.NEW.equals(abnormalBill.getStatus()) && !abnormalBill.getReportSendUserGroup().equals("BPM")){
if(Constants.NEW.equals(abnormalBill.getStatus()) && abnormalBill.getBpmSubmit().equals("false")){
this.anomalyCreatedAndSendMessage(abnormalBill,null);
}
@ -691,16 +706,16 @@ 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())){
// AbnormalBill aBill = new AbnormalBill();
// aBill.setAbnormalNo(abnormalBill.getAbnormalNo());
// List<AbnormalBill> abnormalBills = this.selectList(aBill);
// abnormalBills.get(0).setStatus(Constants.SHUT_DOWN);
// YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBills.get(0), abnormalBillDispose, null, null);
// if (!bpmApiRes.getErrCode().equals(0)) {
// throw BusinessException.build("BPM闭环关闭失败");
// }
// }
/* if (StringUtil.isBlank(abnormalBill.getBpmSubmit())){
AbnormalBill aBill = new AbnormalBill();
aBill.setAbnormalNo(abnormalBill.getAbnormalNo());
List<AbnormalBill> abnormalBills = this.selectList(aBill);
abnormalBills.get(0).setStatus(Constants.SHUT_DOWN);
YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBills.get(0), abnormalBillDispose, null, null);
if (!bpmApiRes.getErrCode().equals(0)) {
throw BusinessException.build("BPM闭环关闭失败");
}
}*/
if(!StringUtil.isBlank(abnormalBill.getStatus())){
abnormalBill.setStatus(abnormalBill.getStatus());

Write Preview
Loading…
Cancel
Save