From 6876d993aaa6d862261903190cbab11c5c99f937 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 28 Sep 2022 15:48:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=B3=BB=E7=BB=9F=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnormalBillController.java | 6 +- .../service/impl/AbnormalBillServiceImpl.java | 67 ++++++++++++------- 2 files changed, 44 insertions(+), 29 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java index b0ebfaff..90b3d78b 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java @@ -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方案确认回传成功"); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index 5bdcc555..d74d7842 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -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 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 productCategoryList = dataFieldListService.findDataFieldListById(dataField); + for (int i = 0; i < productCategoryList.size(); i++) { + String dataValue = JSONArray.toJSONString(productCategoryList.get(i)); + HashMap fieldMap = JSON.parseObject(dataValue, HashMap.class); + if (fieldMap.get("dataValue").equals(abnormalBill.getProductCategory())){ + abnormalBill.setProductCategory(fieldMap.get("description")); + } + } + List 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 abnormalNcCodes = new ArrayList<>(); @@ -333,7 +348,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl 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 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());