|
|
|
|
@ -86,6 +86,8 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private IQcCheckUnqualifiedService qcCheckUnqualifiedService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private QcProCheckService qcProCheckService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询来料检验
|
|
|
|
|
@ -124,6 +126,32 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
|
|
|
|
|
public List<QcCheckTaskIncome> selectQcCheckTaskIncomeList(QcCheckTaskIncome qcCheckTaskIncome) {
|
|
|
|
|
qcCheckTaskIncome.setDelFlag("0");
|
|
|
|
|
qcCheckTaskIncome.setTypeCode("material");
|
|
|
|
|
|
|
|
|
|
// //发企业微信--------------------开始(跟班组无关)
|
|
|
|
|
// SysNoticeGroup noticeQo = new SysNoticeGroup();
|
|
|
|
|
// noticeQo.setNoticeId(6L);
|
|
|
|
|
// List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNotices(noticeQo);
|
|
|
|
|
// if(!CollectionUtils.isEmpty(notices)) {
|
|
|
|
|
// List<WechartDTO> wecharts = new ArrayList<>();
|
|
|
|
|
//
|
|
|
|
|
// List<String> wxids = new ArrayList<>();
|
|
|
|
|
// wxids.add("MES002");
|
|
|
|
|
// for (String wxid : wxids) {
|
|
|
|
|
// WechartDTO wechart0 = new WechartDTO();
|
|
|
|
|
// wechart0.setUserId(wxid);
|
|
|
|
|
// wechart0.setText("您好，有一条新的来料检验任务，需要您登陆手持进行处理。");
|
|
|
|
|
// wecharts.add(wechart0);
|
|
|
|
|
// }
|
|
|
|
|
// logger.info("来料检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts));
|
|
|
|
|
// if (!CollectionUtils.isEmpty(wecharts)) {
|
|
|
|
|
// new Thread(() -> {
|
|
|
|
|
// AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts);
|
|
|
|
|
// logger.info("来料检验企业微信提醒结果：" + JSONObject.toJSONString(result));
|
|
|
|
|
//
|
|
|
|
|
// }).start();
|
|
|
|
|
// }
|
|
|
|
|
// //发企业微信--------------------结束
|
|
|
|
|
// }
|
|
|
|
|
return qcCheckTaskIncomeMapper.selectQcCheckTaskIncomeList(qcCheckTaskIncome);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -270,34 +298,34 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
|
|
|
|
|
}
|
|
|
|
|
int s = qcCheckTaskDetailMapper.addBatch(items);
|
|
|
|
|
|
|
|
|
|
//发企业微信--------------------开始(跟班组无关)
|
|
|
|
|
SysNoticeGroup noticeQo = new SysNoticeGroup();
|
|
|
|
|
noticeQo.setNoticeId(6L);
|
|
|
|
|
List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNotices(noticeQo);
|
|
|
|
|
if(!CollectionUtils.isEmpty(notices)) {
|
|
|
|
|
List<WechartDTO> wecharts = new ArrayList<>();
|
|
|
|
|
//去主库查微信id
|
|
|
|
|
DynamicDataSourceContextHolder.push("master");// 这是数据源的key
|
|
|
|
|
List<String> userCodes = users.stream()
|
|
|
|
|
.map(QcUserMaterialDTO::getUserCode)
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
List<String> wxids = qcCheckTaskIncomeMapper.getWxId(userCodes);
|
|
|
|
|
for (String wxid : wxids) {
|
|
|
|
|
WechartDTO wechart0 = new WechartDTO();
|
|
|
|
|
wechart0.setUserId(wxid);
|
|
|
|
|
wechart0.setText(notices.get(0).getNoticeContent());
|
|
|
|
|
wecharts.add(wechart0);
|
|
|
|
|
}
|
|
|
|
|
logger.info("来料检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts));
|
|
|
|
|
if (!CollectionUtils.isEmpty(wecharts)) {
|
|
|
|
|
new Thread(() -> {
|
|
|
|
|
AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts);
|
|
|
|
|
logger.info("来料检验企业微信提醒结果：" + JSONObject.toJSONString(result));
|
|
|
|
|
|
|
|
|
|
}).start();
|
|
|
|
|
}
|
|
|
|
|
//发企业微信--------------------结束
|
|
|
|
|
}
|
|
|
|
|
// //发企业微信--------------------开始(跟班组无关)
|
|
|
|
|
// SysNoticeGroup noticeQo = new SysNoticeGroup();
|
|
|
|
|
// noticeQo.setNoticeId(6L);
|
|
|
|
|
// List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNotices(noticeQo);
|
|
|
|
|
// if(!CollectionUtils.isEmpty(notices)) {
|
|
|
|
|
// List<WechartDTO> wecharts = new ArrayList<>();
|
|
|
|
|
// //去主库查微信id
|
|
|
|
|
// DynamicDataSourceContextHolder.push("master");// 这是数据源的key
|
|
|
|
|
// List<String> userCodes = users.stream()
|
|
|
|
|
// .map(QcUserMaterialDTO::getUserCode)
|
|
|
|
|
// .collect(Collectors.toList());
|
|
|
|
|
// List<String> wxids = qcCheckTaskIncomeMapper.getWxId(userCodes);
|
|
|
|
|
// for (String wxid : wxids) {
|
|
|
|
|
// WechartDTO wechart0 = new WechartDTO();
|
|
|
|
|
// wechart0.setUserId(wxid);
|
|
|
|
|
// wechart0.setText(notices.get(0).getNoticeContent());
|
|
|
|
|
// wecharts.add(wechart0);
|
|
|
|
|
// }
|
|
|
|
|
// logger.info("来料检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts));
|
|
|
|
|
// if (!CollectionUtils.isEmpty(wecharts)) {
|
|
|
|
|
// new Thread(() -> {
|
|
|
|
|
// AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts);
|
|
|
|
|
// logger.info("来料检验企业微信提醒结果：" + JSONObject.toJSONString(result));
|
|
|
|
|
//
|
|
|
|
|
// }).start();
|
|
|
|
|
// }
|
|
|
|
|
// //发企业微信--------------------结束
|
|
|
|
|
// }
|
|
|
|
|
return s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -879,4 +907,22 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public String getWeightValue(String id) {
|
|
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
|
|
return "";
|
|
|
|
|
}
|
|
|
|
|
QcCheckTaskDetail qcCheckTaskDetail = new QcCheckTaskDetail();
|
|
|
|
|
qcCheckTaskDetail.setRecordId(id);
|
|
|
|
|
|
|
|
|
|
///获取当前所选工厂
|
|
|
|
|
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
|
|
|
|
String key = "#header.poolName";
|
|
|
|
|
String factoryCode = request.getHeader(key.substring(8));
|
|
|
|
|
qcCheckTaskDetail.setFactoryCode(factoryCode);
|
|
|
|
|
|
|
|
|
|
return qcProCheckService.getWeightInfo(qcCheckTaskDetail);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
mengjiao
10 months ago