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

质量异常接口

Browse Source
master
yinq 2 years ago
parent 0457702fa5
commit 1fcc38d077
4 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -370,6 +370,7 @@ public class AbnormalBillController {
bpmVO.setItem(routerDto.getItem());
bpmVO.setShopOrder(routerBpmVO.getShopOrder());
bpmVO.setSite(routerDto.getSite());
bpmVO.setRouterBo(routerDto.getRouterBo());
RouterStep routerStep = new RouterStep();
routerStep.setRouterBo(routerDto.getRouterBo());
List<RouterStepDto> routerOperationByRouterBo = routerStepService.findRouterOperationByRouterBo(site, routerDto.getRouterBo());
@ -394,6 +395,7 @@ public class AbnormalBillController {
com.foreverwin.modular.core.util.CommonMethods.setSite("1000");
String site = com.foreverwin.modular.core.util.CommonMethods.getSite();
com.foreverwin.modular.core.util.CommonMethods.setUser("BPM_USER");
LocalDateTime now = LocalDateTime.now();
if (!yunBpmConfig.secretKey.equals(secretKey)){
return new ResultVo(ResultCode.FAILED,"秘钥错误");
}
@ -407,6 +409,10 @@ public class AbnormalBillController {
abnormalBill.setReportFrom("J");
abnormalBill.setItemBo(HandleEnum.ITEM.getHandle(site,abnormalBill.getItemBo(),"A"));
abnormalBill.setReportSendUserGroup("BPM");
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");
abnormalBillService.anomalyReport(abnormalBill, abnormalBillDispose,
@ -435,7 +441,8 @@ 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方案确认回传成功");
}catch(Exception e){

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

@ -65,6 +65,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
@ -270,17 +271,22 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
/**
* mes提报给质量bpm系统
*/
// if (StringUtil.isBlank(abnormalBill.getBpmSubmit())){
// abnormalBill.setBpmSubmit("false");
// YunBpmApiRes bpmApiRes = yunBpmService.saveQualitySystem(abnormalBill, abnormalBillDispose,
// StringUtils.extract(ncGroup.toString(), "[", "]"),
// StringUtils.extract(ncGroupAndNcCodes.toString(), "[", "]"));
// 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")) {
//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);
}
ArrayList<AbnormalNcCode> abnormalNcCodes = new ArrayList<>();
for(int i = 0; i < ncGroup.size(); i ++){
@ -324,7 +330,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
//发送消息
if(Constants.NEW.equals(abnormalBill.getStatus())){
if(Constants.NEW.equals(abnormalBill.getStatus()) && !abnormalBill.getReportSendUserGroup().equals("BPM")){
this.anomalyCreatedAndSendMessage(abnormalBill,null);
}
@ -682,6 +688,17 @@ 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.getStatus())){
abnormalBill.setStatus(abnormalBill.getStatus());
}else{

5
anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
Unescape Escape View File

@ -50,7 +50,8 @@
<result column="ITEM_NUMBER" property="itemNumber" />
<result column="USER_CON_TIME" property="userConTime" />
<result column="USER_IS_CON" property="userIsCon" />
<result column="BPM_FLOW_ID" property="bpmFlowId" />
<result column="BPM_SUBMIT" property="bpmSubmit" />
</resultMap>
<resultMap id="abnormalBillDto" type="com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto" extends="BaseResultMap">
@ -84,7 +85,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
HANDLE, SITE, ABNORMAL_NO, STATUS, CORRECTION, PROGRAM, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, PRODUCT_CATEGORY, STEP_ID, WORK_ORDER, ITEM_NUMBER
HANDLE, SITE, ABNORMAL_NO, STATUS, CORRECTION, PROGRAM, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, PRODUCT_CATEGORY, STEP_ID, WORK_ORDER, ITEM_NUMBER,BPM_FLOW_ID,BPM_SUBMIT
</sql>
<!-- BaseMapper标准查询/修改/删除 -->

2
anomaly/src/main/resources/mapper/ReportMapper.xml
Unescape Escape View File

@ -1832,7 +1832,7 @@
it.DESCRIPTION "itemDescription",--物料描述
MIN(zsd.ACTUAL_START_DATE) "actualStartDate",--最小实际开始时间
MAX(zsd.ACTUAL_COMPLETE_DATE) "actualCompeteDate",--最大实际完成时间
TO_CHAR(MAX(zsd.ACTUAL_COMPLETE_DATE) - MIN(zsd.ACTUAL_START_DATE), '99990.99') "productPmonthDeliveryRateReportrogress"
TO_CHAR(MAX(zsd.ACTUAL_COMPLETE_DATE) - MIN(zsd.ACTUAL_START_DATE), '99990.99') "productProgress"
FROM Z_SFC_DISPATCH zsd
LEFT JOIN SFC s ON s.SFC = zsd.SFC AND s.SITE = zsd.SITE
LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE

Write Preview
Loading…
Cancel
Save