|
|
|
@ -273,6 +273,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
abnormalNcCodeService.saveOrUpdateBatch(abnormalNcCodes);
|
|
|
|
|
abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
|
|
|
|
|
this.saveOrUpdate(abnormalBill);
|
|
|
|
|
/**
|
|
|
|
|
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
|
|
|
|
|
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
|
|
|
|
|
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
|
|
|
|
|
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
|
|
|
|
|
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
|
|
|
|
|
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
|
|
|
|
|
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
|
|
|
|
|
* XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//发送消息
|
|
|
|
|
if(Constants.NEW.equals(abnormalBill.getStatus())){
|
|
|
|
|
this.anomalyCreatedAndSendMessage(abnormalBill,null);
|
|
|
|
@ -585,12 +597,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 判断SFC ,设备异常提交,sfc可以为空
|
|
|
|
|
* 判断SFC ,设备异常提交,sfc可以为空,质量异常提报sfc和物料编号其中一个不能为空
|
|
|
|
|
* 设备编号
|
|
|
|
|
* 是否为空
|
|
|
|
|
*/
|
|
|
|
|
if(StringUtil.isBlank(abnormalBill.getSfc()) && !Constants.ABNORMAL_RESRCE.equals(abnormalBill.getType())) {
|
|
|
|
|
throw BusinessException.build("产品条码不能为空");
|
|
|
|
|
if(Constants.ABNORMAL_QUALITY.equals(abnormalBill.getType())){
|
|
|
|
|
if(StringUtil.isBlank(abnormalBill.getItemBo())){
|
|
|
|
|
throw BusinessException.build("物料编号不能为空");
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
throw BusinessException.build("产品条码不能为空");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -659,11 +677,13 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
status.add(Constants.PROGRAM_CONFIRM);
|
|
|
|
|
status.add(Constants.CANCEL);
|
|
|
|
|
status.add(Constants.SHUT_DOWN);
|
|
|
|
|
List<AbnormalBill> abnormalBillList = abnormalBillMapper.findCountBySfc(abnormalBill.getSite(), abnormalBill.getType(), abnormalBill.getSfc(), status);
|
|
|
|
|
String abnormalType = abnormalBill.getType().equals(Constants.ABNORMAL_QUALITY) ? "质量异常" :
|
|
|
|
|
abnormalBill.getType().equals(Constants.ABNORMAL_OTHER) ? "其他异常" : "设备异常" ;
|
|
|
|
|
if(abnormalBillList.size() >= 1 ){
|
|
|
|
|
throw BusinessException.build(abnormalType + "有未处理完成的产品条码(SFC)");
|
|
|
|
|
if(!StringUtil.isBlank(abnormalBill.getSfc())) {
|
|
|
|
|
List<AbnormalBill> abnormalBillList = abnormalBillMapper.findCountBySfc(abnormalBill.getSite(), abnormalBill.getType(), abnormalBill.getSfc(), status);
|
|
|
|
|
String abnormalType = abnormalBill.getType().equals(Constants.ABNORMAL_QUALITY) ? "质量异常" :
|
|
|
|
|
abnormalBill.getType().equals(Constants.ABNORMAL_OTHER) ? "其他异常" : "设备异常";
|
|
|
|
|
if (abnormalBillList.size() >= 1) {
|
|
|
|
|
throw BusinessException.build(abnormalType + "有未处理完成的产品条码(SFC)");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -779,18 +799,33 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
if(StringUtil.isBlank(abnormalBillDispose.getAbnormalMethod())){
|
|
|
|
|
throw BusinessException.build("转维修时方案分类必须填写");
|
|
|
|
|
}
|
|
|
|
|
abnormalBill.setHandle(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo()));
|
|
|
|
|
abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
|
|
|
|
|
this.saveOrUpdate(abnormalBill);
|
|
|
|
|
abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
|
|
|
|
|
HashMap<String, Object> hashMap = new HashMap<>();
|
|
|
|
|
hashMap.put("abnormalBill",abnormalBillMapper.selectById(abnormalBill.getHandle()));
|
|
|
|
|
hashMap.put("abnormalBillDispose",abnormalBillDisposeMapper.selectById(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo())));
|
|
|
|
|
return hashMap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public void anomalyReveseRepairShutDown(String abnormalNo){
|
|
|
|
|
String site = CommonMethods.getSite();
|
|
|
|
|
String user = CommonMethods.getUser();
|
|
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
|
|
AbnormalBill abnormalBill = getById(HandleEnum.ABNORMAL_BILL.getHandle(site, abnormalNo));
|
|
|
|
|
if(!Constants.RESPONSE.equals(abnormalBill.getStatus())){
|
|
|
|
|
throw new BaseException("状态不在响应中,请重新检索");
|
|
|
|
|
}
|
|
|
|
|
abnormalBill.setHandle(HandleEnum.ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo()));
|
|
|
|
|
abnormalBill.setStatus(Constants.SHUT_DOWN);
|
|
|
|
|
AbnormalBillDispose abnormalBillDispose = abnormalBillDisposeMapper.selectById(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site, abnormalBill.getAbnormalNo()));
|
|
|
|
|
abnormalBillDispose.setResolveUser(user);
|
|
|
|
|
abnormalBillDispose.setResolveDateTime(now);
|
|
|
|
|
abnormalBillDispose.setHandle(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
|
|
|
|
|
this.saveOrUpdate(abnormalBill);
|
|
|
|
|
abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
|
|
|
|
|
HashMap<String, Object> hashMap = new HashMap<>();
|
|
|
|
|
hashMap.put("abnormalBill",abnormalBillMapper.selectById(abnormalBill.getHandle()));
|
|
|
|
|
hashMap.put("abnormalBillDispose",abnormalBillDisposeMapper.selectById(abnormalBillDispose.getHandle()));
|
|
|
|
|
return hashMap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@ -980,9 +1015,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
//发送消息
|
|
|
|
|
if(!Constants.ABNORMAL_MESSAGE_RESPONSE.equals(abnormalMessage.getNode())){
|
|
|
|
|
List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(site,abnormalMessage.getSendUserGroup());
|
|
|
|
|
|
|
|
|
|
if(nwaUsers != null && nwaUsers.size() <= 0){
|
|
|
|
|
throw new BaseException("消息发送失败,发送的用户组下面没有用户");
|
|
|
|
|
}
|
|
|
|
|
StringBuilder sendUsers = new StringBuilder();
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < nwaUsers.size(); i++) {
|
|
|
|
|
if(i == (nwaUsers.size() - 1)){
|
|
|
|
|
sendUsers.append(nwaUsers.get(i).getUserName());
|
|
|
|
@ -1050,7 +1086,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
messageMap.put("shutDown",AnomalyConstant.ShutDown.msg(messageContent.getShutDown()));
|
|
|
|
|
|
|
|
|
|
//判断该异常单的状态是否是纠防确认
|
|
|
|
|
if(Constants.CORRECTION_CONFIRM.equals(messageContent.getStatus())){
|
|
|
|
|
if(Constants.CORRECTION_CONFIRM.equals(messageContent.getStatus()) || Constants.SHUT_DOWN.equals(messageContent.getStatus())){
|
|
|
|
|
|
|
|
|
|
DataField dataField = new DataField();
|
|
|
|
|
dataField.setSite(site);
|
|
|
|
@ -1091,7 +1127,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
messageMap.put("dutyCauseDescription",messageContent.getDutyCauseDescription());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(Constants.PROGRAM_CONFIRM.equals(messageContent.getStatus())){
|
|
|
|
|
if(Constants.PROGRAM_CONFIRM.equals(messageContent.getStatus()) || Constants.SHUT_DOWN.equals(messageContent.getStatus())){
|
|
|
|
|
messageMap.put("abnormalMethod",AnomalyConstant.AnomalyMethod.msg(messageContent.getAbnormalMethod()));
|
|
|
|
|
messageMap.put("resolveRemark",messageContent.getResolveRemark());
|
|
|
|
|
messageMap.put("router",messageContent.getRouterDescription());
|
|
|
|
@ -1120,7 +1156,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
|
|
|
|
|
if(this.jgProductionIsScrap(site,sfc)){
|
|
|
|
|
throw new BaseException("该产品条码的异常方案不是报废");
|
|
|
|
|
}
|
|
|
|
|
return abnormalBillMapper.findScrapDtoBySfc(site, sfc);
|
|
|
|
|
List<ScrapDto> scrapDtoBySfc = abnormalBillMapper.findScrapDtoBySfc(site, sfc);
|
|
|
|
|
return scrapDtoBySfc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|