From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java | 285 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 209 insertions(+), 76 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
index 494fba5..36890f0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,6 +18,7 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
@@ -32,12 +34,14 @@
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: 璁惧鍊熷嚭褰掕繕
@@ -82,8 +86,6 @@
//娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
}
- //鎺у埗寰呮彁浜ょ姸鎬佺殑鏁版嵁鍙兘鏈汉鏌ョ湅
- queryWrapper.and(i -> i.ne("wmo.lean_status", EquipmentLeanOutStatusEnum.WAIT_SUBMIT).or().eq("wmo.lean_person", sysUser.getUsername()));
//鏌ヨ鏉′欢杩囨护
if (query != null) {
if (StringUtils.isNotBlank(query.getEquipmentId())) {
@@ -190,7 +192,7 @@
throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
if (!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getLeanStatus())) {
- throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囨彁浜わ紒");
}
//妫�鏌ヨ澶�
EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
@@ -200,12 +202,18 @@
if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
throw new JeecgBootException("姝よ澶囧綋鍓嶈祫浜х姸鎬佷笉鍏佽鍊熷嚭锛�");
}
+ // 鍒嗛厤缁欎娇鐢ㄥ崟浣嶉瀵�
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0008);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰鍗曚綅棰嗗锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (sysUser == null) {
- throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鍊熺敤璁板綍锛�");
+ if (sysUser == null || !BusinessCodeConst.PCR0004.equals(sysUser.getPost())) {
+ throw new JeecgBootException("涓嶆槸璁惧绠＄悊鍛橈紝鏃犳硶鎻愪氦姝ゅ伐鍗曪紒");
}
UpdateWrapper<EamEquipmentLeanOut> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("lean_status", EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name());
+ updateWrapper.set("lean_status", EquipmentLeanOutStatusEnum.WAIT_APPROVAL_OUT.name());
updateWrapper.eq("id", id);
updateWrapper.eq("lean_person", sysUser.getUsername());
boolean success = super.update(updateWrapper);
@@ -226,13 +234,11 @@
variables.put("comment", entity.getLeanReason());
}
variables.put("proofreading", true);
- List<String> usernames = new ArrayList<>();
- usernames.add(equipment.getEquipmentManager());
variables.put("NextAssignee", usernames);
Result result = flowDefinitionService.startProcessInstanceByKey("equipment_lean_out", variables);
if (result != null) {
entity.setLeanStartTime(new Date());
- entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name());
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_APPROVAL_OUT.name());
//淇濆瓨宸ュ崟
equipmentLeanOutMapper.updateById(entity);
return result.isSuccess();
@@ -242,6 +248,53 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public boolean equipmentReturn(String id) {
+ EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(id);
+ if (entity == null) {
+ throw new JeecgBootException("瑕佹彁浜ょ殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!EquipmentLeanOutStatusEnum.WAIT_RETURN.name().equals(entity.getLeanStatus())) {
+ throw new JeecgBootException("褰撳墠鏁版嵁鐘舵�佷笉鍏佽缂栬緫锛�");
+ }
+ //妫�鏌ヨ澶�
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紒");
+ }
+ // 鍒嗛厤缁欏�熺敤鍗曚綅棰嗗
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(entity.getLeanDepartId(), BusinessCodeConst.PCR0008);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰鍗曚綅棰嗗锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null || !BusinessCodeConst.PCR0004.equals(sysUser.getPost())) {
+ throw new JeecgBootException("涓嶆槸璁惧绠＄悊鍛橈紝鏃犳硶鎻愪氦姝ゅ伐鍗曪紒");
+ }
+ //鍚姩瀹℃壒娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getCode() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧褰掕繕",
+ entity.getId(), "IEamEquipmentLeanOutService", "equipment_return", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", entity.getId());
+ variables.put("organization", "鏂板褰掕繕榛樿褰掕繕娴佺▼");
+ variables.put("comment", "鏂板褰掕繕榛樿褰掕繕娴佺▼");
+ variables.put("proofreading", true);
+
+ List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("equipment_return", variables);
+ if (result != null) {
+ entity.setLeanEndTime(new Date());
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM_RETURN.name());
+ //淇濆瓨宸ュ崟
+ equipmentLeanOutMapper.updateById(entity);
+ return result.isSuccess();
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.LEAN_OUT, businessTable = "eam_equipment_lean_out")
public EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request) {
EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(request.getId());
if (entity == null) {
@@ -252,7 +305,7 @@
if (user == null || StrUtil.isBlank(user.getId())) {
throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
}
- request.setApprovalUser(user.getUsername());
+// request.setApprovalUser(user.getUsername());
// 鑾峰彇娴佺▼涓氬姟璁板綍
FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId());
if (flowMyBusiness == null) {
@@ -273,83 +326,163 @@
throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
}
- EquipmentLeanOutStatusEnum status = EquipmentLeanOutStatusEnum.getInstance(entity.getLeanStatus());
- if (status == null) {
- return null;
- }
- //娴佺▼鍙橀噺
- Map<String, Object> values = new HashMap<>();
- switch (status) {
- // 瀹℃壒
- case WAIT_APPROVAL:
- //鎵ц瀹屾垚
- values.put("dataId", entity.getId());
- values.put("organization", request.getApprovalComment());
- values.put("comment", request.getApprovalComment());
- values.put("approvalDealType", request.getApprovalDealType());
- request.setComment(request.getApprovalComment());
- entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
- entity.setApprovalComment(request.getApprovalComment());// 瀹℃牳鎰忚
- entity.setApprovalTime(new Date());// 瀹℃牳鏃堕棿
- entity.setApprovalDealType(request.getApprovalDealType()); // 瀹℃壒绫诲瀷
- // 楠岃瘉閫氳繃杩樻槸椹冲洖
- if (request.getApprovalDealType().equals("1")) {
- //璁剧疆entity
- entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
- List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
- values.put("NextAssignee", userApprovalList);
- } else {
- //璁剧疆entity
- entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
- }
- break;
- // 褰掕繕
- case WAIT_RETURN:
- if (StringUtils.isBlank(equipment.getEquipmentManager())) {
- throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
- }
- List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
- userApprovalList.add(equipment.getEquipmentManager());
- values.put("dataId", entity.getId());
- values.put("organization", request.getReturnComment());
- values.put("comment", request.getReturnComment());
- values.put("NextAssignee", userApprovalList);
- request.setComment(request.getReturnComment());
- entity.setLeanEndTime(new Date()); //褰掕繕鏃堕棿
- //璁剧疆entity
- entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM.name());
- entity.setApprovalUser(user.getUsername());// 瀹℃牳浜�
- entity.setLeanEndTime(new Date());// 褰掕繕鏃堕棿
- entity.setReturnComment(request.getReturnComment());// 褰掕繕澶囨敞
- break;
- // 褰掕繕纭
- case WAIT_CONFIRM:
- values.put("dataId", entity.getId());
- values.put("organization", request.getConfirmComment());
- values.put("comment", request.getConfirmComment());
- request.setComment(request.getConfirmComment());
- //璁剧疆entity
- entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
- entity.setConfirmUser(user.getUsername());
- entity.setConfirmComment(request.getConfirmComment());
- entity.setConfirmTime(new Date());
- // 淇敼璁惧鐘舵��
- equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
- eamEquipmentService.updateById(equipment);
- break;
- }
- request.setValues(values);
+ //璁剧疆娴佺▼鍙橀噺
+ setupProcessVariables(request, entity, user, equipment);
// 瀹屾垚娴佺▼浠诲姟
Result result = flowTaskService.complete(request);
if (!result.isSuccess()) {
throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
}
+
+ // 鏍规嵁浠诲姟瀹屾垚缁撴灉鏇存柊宸ュ崟鐘舵��
+ updateOrderStatus(result, request, entity, user, equipment);
+
//淇濆瓨宸ュ崟
equipmentLeanOutMapper.updateById(entity);
return entity;
}
+ /**
+ * 鏇存柊宸ュ崟鐘舵��
+ * @param result
+ * @param request
+ * @param entity
+ * @param user
+ * @param equipment
+ */
+ private void updateOrderStatus(Result result, EamEquipmentLeanOutRequest request, EamEquipmentLeanOut entity, LoginUser user, EamEquipment equipment) {
+ if (result.isSuccess()) {
+ EquipmentLeanOutStatusEnum status = EquipmentLeanOutStatusEnum.getInstance(entity.getLeanStatus());
+ switch (status) {
+ case WAIT_APPROVAL_OUT:
+ entity.setUseApprovalUser(user.getUsername());
+ entity.setUseApprovalComment(request.getUseApprovalComment());
+ entity.setUseApprovalTime(new Date());
+ entity.setUseApprovalDealType(request.getUseApprovalDealType());
+ if (CommonConstant.APPROVED.equals(request.getUseApprovalDealType())) {
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_APPROVAL_IN.name());
+ } else {
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.REJECT.name());
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+ eamEquipmentService.updateById(equipment);
+ }
+ break;
+ case WAIT_APPROVAL_IN:
+ entity.setLeanOutApprovalUser(user.getUsername());
+ entity.setLeanOutApprovalComment(request.getLeanOutApprovalComment());
+ entity.setLeanOutApprovalTime(new Date());
+ entity.setLeanOutApprovalDealType(request.getLeanOutApprovalDealType());
+ if (CommonConstant.APPROVED.equals(request.getLeanOutApprovalDealType())) {
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
+ } else {
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.REJECT.name());
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+ eamEquipmentService.updateById(equipment);
+ }
+ break;
+ case WAIT_CONFIRM_RETURN:
+ entity.setLeanOutConfirmUser(user.getUsername());
+ entity.setLeanOutConfirmComment(request.getLeanOutConfirmComment());
+ entity.setLeanOutConfirmTime(new Date());
+ entity.setLeanOutConfirmDealType(request.getLeanOutConfirmDealType());
+ if (CommonConstant.APPROVED.equals(request.getLeanOutConfirmDealType())) {
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM_BORROW.name());
+ } else {
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
+ }
+ break;
+ case WAIT_CONFIRM_BORROW:
+ entity.setUseConfirmUser(user.getUsername());
+ entity.setUseConfirmComment(request.getUseConfirmComment());
+ entity.setUseConfirmTime(new Date());
+ entity.setUseConfirmDealType(request.getUseConfirmDealType());
+ if (CommonConstant.APPROVED.equals(request.getUseConfirmDealType())) {
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
+ equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
+ eamEquipmentService.updateById(equipment);
+ } else {
+ entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
+ }
+ break;
+ }
+ }
+ }
+
+ /**
+ * 鏇存柊娴佺▼鐘舵��
+ *
+ * @param request
+ * @param entity
+ * @param user
+ * @param equipment
+ */
+ private void setupProcessVariables(EamEquipmentLeanOutRequest request, EamEquipmentLeanOut entity, LoginUser user, EamEquipment equipment) {
+ Map<String, Object> values = new HashMap<>();
+ List<UserSelector> userSelectors;
+ List<String> userApprovalList;
+ EquipmentLeanOutStatusEnum status = EquipmentLeanOutStatusEnum.getInstance(entity.getLeanStatus());
+ switch (status) {
+ case WAIT_APPROVAL_OUT:
+ // 浣跨敤鍗曚綅鍑哄巶瀹℃壒瀹屾垚
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getUseApprovalComment());
+ values.put("comment", request.getUseApprovalComment());
+ if (CommonConstant.APPROVED.equals(request.getUseApprovalDealType())) {
+ // 閫氳繃
+ values.put("approvalDealType", request.getUseApprovalDealType());
+ // 鑾峰彇涓嬩竴姝ュ鎵逛汉
+ userSelectors = sysUserService.selectOperatorList(entity.getLeanDepartId(), BusinessCodeConst.PCR0008);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("鏈垎閰嶅�熺敤杞﹂棿鍗曚綅棰嗗锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ // 椹冲洖
+ values.put("approvalDealType", request.getUseApprovalDealType());
+ }
+ request.setComment("浣跨敤鍗曚綅鍑哄巶瀹℃壒瀹屾垚");
+ break;
+ case WAIT_APPROVAL_IN:
+ // 鍊熺敤鍗曚綅鍏ュ巶瀹℃壒瀹屾垚
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getLeanOutApprovalComment());
+ values.put("comment", request.getLeanOutApprovalComment());
+ request.setComment("鍊熺敤鍗曚綅鍏ュ巶瀹℃壒瀹屾垚");
+ break;
+ case WAIT_CONFIRM_RETURN:
+ // 褰掕繕鍗曚綅纭瀹屾垚
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getLeanOutConfirmComment());
+ values.put("comment", request.getLeanOutConfirmComment());
+ if (CommonConstant.APPROVED.equals(request.getLeanOutConfirmDealType())) {
+ // 閫氳繃
+ values.put("approvalDealType", request.getLeanOutConfirmDealType());
+ // 鑾峰彇涓嬩竴姝ュ鎵逛汉
+ userSelectors = sysUserService.selectOperatorList(equipment.getOrgId(), BusinessCodeConst.PCR0008);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("鏈垎閰嶄娇鐢ㄨ溅闂村崟浣嶉瀵硷紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ } else {
+ // 椹冲洖
+ values.put("approvalDealType", request.getLeanOutConfirmDealType());
+ }
+ request.setComment("鍊熺敤鍗曚綅棰嗗纭瀹屾垚");
+ break;
+ case WAIT_CONFIRM_BORROW:
+ // 鍊熷嚭鏂圭‘璁ゅ畬鎴�
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getUseConfirmComment());
+ values.put("comment", request.getUseConfirmComment());
+ request.setComment("浣跨敤鍗曚綅棰嗗纭瀹屾垚");
+ break;
+ }
+ request.setValues(values);
+ }
+
@Override
public void afterFlowHandle(FlowMyBusiness business) {
--
Gitblit v1.9.3