From 5d5606559262e4c6366cf059cda94d28159bbbe9 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 24 七月 2025 13:56:27 +0800
Subject: [PATCH] OEE条件判断
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 63 +++++--------------------------
1 files changed, 10 insertions(+), 53 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 440cf17..93f2f09 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -56,6 +56,7 @@
import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -105,6 +106,9 @@
private ISysUserService sysUserService;
@Autowired
private HistoryService historyService;
+
+ @Value("${wechatEnterprise.cardActionUrl}")
+ private String cardActionUrl;
@Override
public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -191,6 +195,11 @@
}
@Override
+ public List<EamInspectionOrder> selectUnReceivedInspectionOrder() {
+ return this.baseMapper.selectUnReceivedInspectionOrder();
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
@@ -237,27 +246,6 @@
String inspectionStatus = eamInspectionOrder.getInspectionStatus();
EamEquipment equipment = eamEquipmentService.getById(eamInspectionOrder.getEquipmentId());
eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
- //todo 鐩墠纭锛屽緟棰嗗彇宸ュ崟涓嶆帹閫�
- //if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
- // //宸ュ崟寰呴鍙栵紝鎺ㄩ�佹秷鎭粰鎵�鏈夋搷浣滃伐
- // String orgId = Optional.ofNullable(eamEquipmentService.getById(eamInspectionOrder.getEquipmentId()))
- // .map(EamEquipment::getOrgId)
- // .orElse(null);
- // if (orgId == null) {
- // throw new IllegalArgumentException("鏈壘鍒拌澶囩殑缁勭粐 ID");
- // }
- // //鏌ヨ璇ヨ澶囨墍灞炰骇绾跨殑鎵�鏈夋搷浣滃伐
- // List<SysUser> sysUserList = mdcUserProductionService.queryByPostAndProId("PCR0001", orgId);
- // List<String> usernameList = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());
- // if (usernameList.isEmpty()) {
- // throw new IllegalArgumentException("鏈壘鍒拌璁惧鎵�灞炰骇绾跨殑鎿嶄綔宸ワ紝璇疯仈绯荤鐞嗗憳澶勭悊");
- // }
- // String nextAssigneeStr = usernameList.stream()
- // .filter(Objects::nonNull) // 鍙�夛細杩囨护 null 鍊�
- // .collect(Collectors.joining(","));
- // String touser = wechatEnterpriseService.getTouser(nextAssigneeStr, false);
- // templateCard.setTouser(touser);
- //}
if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) {
//宸ュ崟宸插紑濮嬬偣妫�锛屾帹閫佹秷鎭粰鍏蜂綋鎿嶄綔宸ワ紙鏂板宸ュ崟鏃舵寚瀹氥�侀鍙栧伐鍗曠殑鎿嶄綔宸ワ級
String operator = eamInspectionOrder.getOperator();
@@ -276,12 +264,6 @@
String touser = wechatEnterpriseService.getTouser(nextAssigneeStr, false);
templateCard.setTouser(touser);
}
- //todo 宸ュ崟瀹屾垚锛屼笉鎺ㄩ�佹秷鎭�
- //if (InspectionStatus.COMPLETE.name().equals(inspectionStatus)) {
- // //宸ュ崟宸茬‘璁ゅ畬鎴愶紝鎺ㄩ�佹秷鎭粰鐐规浜�
- // String touser = wechatEnterpriseService.getTouser(eamInspectionOrder.getOperator(), false);
- // templateCard.setTouser(touser);
- //}
TemplateCardEntity templateCardEntity = new TemplateCardEntity();
templateCard.setTemplate_card(templateCardEntity);
@@ -290,9 +272,6 @@
mainTitle.setTitle("璁惧鐐规");
templateCardEntity.setMain_title(mainTitle);
- //if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
- // templateCardEntity.setSub_title_text("鏂板璁惧鐐规宸ュ崟: " + eamInspectionOrder.getOrderNum() + " ,璇疯繘鍏ョ郴缁熼鍙�");
- //}
if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) {
if (Objects.nonNull(request) && StrUtil.isNotBlank(request.getConfirmDealType())) {
//鏄┏鍥炵殑鍗曞瓙
@@ -304,9 +283,6 @@
if (InspectionStatus.WAIT_CONFIRM.name().equals(inspectionStatus)) {
templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 宸插畬鎴愯澶囩偣妫�,璇疯繘鍏ョ郴缁熺‘璁�");
}
- //if (InspectionStatus.COMPLETE.name().equals(inspectionStatus)) {
- // templateCardEntity.setSub_title_text("宸ュ崟: " + eamInspectionOrder.getOrderNum() + " 宸插畬鎴愮偣妫�鍚庣‘璁�");
- //}
List<TemplateCardEntity.HorizontalContent> horizontalContentList = CollectionUtil.newArrayList();
TemplateCardEntity.HorizontalContent content1 = new TemplateCardEntity.HorizontalContent();
@@ -335,13 +311,6 @@
horizontalContentList.add(content4);
}
- //if (InspectionStatus.WAIT_INSPECTION.name().equals(inspectionStatus)) {
- // TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
- // content3.setKeyname("鍙戣捣浜�");
- // SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getCreateBy());
- // content3.setValue(sysUser.getRealname());
- // horizontalContentList.add(content3);
- //}
if (InspectionStatus.UNDER_INSPECTION.name().equals(inspectionStatus)) {
if (Objects.isNull(request)) {
TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
@@ -369,23 +338,11 @@
content3.setValue(sysUser.getRealname());
horizontalContentList.add(content3);
}
- //if ((InspectionStatus.COMPLETE.name().equals(inspectionStatus))) {
- // TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
- // TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
- // content3.setKeyname("纭浜�");
- // SysUser sysUser = sysUserService.getUserByName(eamInspectionOrder.getCreateBy());
- // content3.setValue(sysUser.getRealname());
- // horizontalContentList.add(content3);
- // content4.setKeyname("纭鎰忚");
- // content4.setValue("閫氳繃");
- // horizontalContentList.add(content4);
- //}
-
templateCardEntity.setHorizontal_content_list(horizontalContentList);
TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
cardAction.setType(1);
- cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
+ cardAction.setUrl(cardActionUrl);
templateCardEntity.setCard_action(cardAction);
wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
--
Gitblit v1.9.3