From a44f4b1c063af706404c71f4445aa2258b387e34 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 13:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java | 128 +++++++++++++++++++++++++++++++++++++++++-
src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 2
2 files changed, 126 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index c5a3769..1a4c0de 100644
--- a/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -12,6 +12,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
@@ -109,6 +110,7 @@
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
eamInspectionOrderRequest.setOrderNum(codeSeq);
eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));
+ eamInspectionOrderRequest.setDelFlag(CommonConstant.DEL_FLAG_0);
eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
return Result.OK("娣诲姞鎴愬姛锛�");
}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
index 9c1c227..9731f87 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
@@ -13,13 +13,22 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
+import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.EamProcessCheck;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.mes.dto.MesProductionWorkOrderRepublishRequest;
import org.jeecg.modules.mes.dto.MesProductionWorkScheduleRequest;
import org.jeecg.modules.mes.entity.MesKittingCompletenessCheck;
import org.jeecg.modules.mes.entity.MesProductionWorkOrder;
import org.jeecg.modules.mes.enums.ProductionWorkOrderStatus;
+import org.jeecg.modules.mes.service.IMesKittingCompletenessCheckService;
import org.jeecg.modules.mes.service.IMesProductionWorkOrderService;
import org.jeecg.modules.mes.utils.CommonUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +53,18 @@
public class MesProductionWorkOrderController extends JeecgController<MesProductionWorkOrder, IMesProductionWorkOrderService> {
@Autowired
private IMesProductionWorkOrderService mesProductionWorkOrderService;
+ @Autowired
+ private IMesKittingCompletenessCheckService mesKittingCompletenessCheckService;
+ @Autowired
+ private IEamInspectionOrderService eamInspectionOrderService;
+ @Autowired
+ private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
+ @Autowired
+ private IEamProcessCheckService eamProcessCheckService;
+ @Autowired
+ private IEamProcessCheckDetailService eamProcessCheckDetailService;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -210,11 +231,12 @@
@GetMapping(value = "/execute")
public Result<?> execute(@RequestParam("id") String id) {
MesProductionWorkOrder workOrder = mesProductionWorkOrderService.getById(id);
- if (!ProductionWorkOrderStatus.PUBLISHED.name().equals(workOrder.getWorkOrderStatus())
- && !CommonConstant.DEFAULT_1.equals(workOrder.getCompletenessCheckFlag())
- && !CommonConstant.DEFAULT_1.equals(workOrder.getEquipmentInspectionFlag())
- && !CommonConstant.DEFAULT_1.equals(workOrder.getProcessInspectionFlag())) {
+ if (!ProductionWorkOrderStatus.PUBLISHED.name().equals(workOrder.getWorkOrderStatus())) {
return Result.error("褰撳墠宸ュ崟鐘舵�佷笉鑳芥墽琛岋紒");
+ }
+ //妫�鏌ユ槸鍚﹀仛杩囬綈濂楁�ф鏌ャ�佸伐鑹虹偣妫�銆佽澶囩偣妫�
+ if (!completeCheck(workOrder)) {
+ return Result.error("璇峰厛瀹屾垚榻愬鎬ф鏌ャ�佸伐鑹虹偣妫�銆佽澶囩偣妫�锛�");
}
MesProductionWorkOrder executeOrder = new MesProductionWorkOrder()
.setId(id)
@@ -223,6 +245,104 @@
return Result.ok("鎵ц鎴愬姛锛�");
}
+ private boolean completeCheck(MesProductionWorkOrder workOrder) {
+ List<MesKittingCompletenessCheck> completenessCheckList = mesKittingCompletenessCheckService.list(new LambdaQueryWrapper<MesKittingCompletenessCheck>()
+ .eq(MesKittingCompletenessCheck::getWorkOrderId, workOrder.getId()));
+ if (completenessCheckList.isEmpty()) {
+ return false;
+ }
+ List<EamInspectionOrder> inspectionOrderList = eamInspectionOrderService.list(new LambdaQueryWrapper<EamInspectionOrder>()
+ .eq(EamInspectionOrder::getWorkOrderId, workOrder.getId()));
+ if (inspectionOrderList.isEmpty()) {
+ return false;
+ }
+ List<EamProcessCheck> processCheckList = eamProcessCheckService.list(new LambdaQueryWrapper<EamProcessCheck>()
+ .eq(EamProcessCheck::getWorkOrderId, workOrder.getId()));
+ if (processCheckList.isEmpty()) {
+ return false;
+ }
+ return true;
+ }
+
+ @AutoLog(value = "鎺掍骇宸ュ崟-宸ュ崟鎵ц鍓嶆鏌�")
+ @ApiOperation(value = "鎺掍骇宸ュ崟-宸ュ崟鎵ц鍓嶆鏌�", notes = "鎺掍骇宸ュ崟-宸ュ崟鎵ц鍓嶆鏌�")
+ //@RequiresPermissions("org.jeecg.modules:mes_production_work_order:execute")
+ @GetMapping(value = "/checkBeforeExecute")
+ public Result<?> checkBeforeExecute(@RequestParam("id") String id) {
+ MesProductionWorkOrder workOrder = mesProductionWorkOrderService.getById(id);
+ if (workOrder == null) {
+ throw new JeecgBootException("宸ュ崟涓嶅瓨鍦紒");
+ }
+ Map<String, Object> resMap = new HashMap<>();
+ //榻愬鎬ф鏌�
+ List<MesKittingCompletenessCheck> completenessCheckList = mesKittingCompletenessCheckService.list(new LambdaQueryWrapper<MesKittingCompletenessCheck>()
+ .eq(MesKittingCompletenessCheck::getWorkOrderId, id));
+ if (completenessCheckList.isEmpty()) {
+ //鏈墽琛岃繃榻愬鎬ф鏌�
+ resMap.put("completenessCheckFlag", false);
+ } else {
+ List<MesKittingCompletenessCheck> unCompletenessList = completenessCheckList.stream().filter(i -> !CommonConstant.DEFAULT_1.equals(i.getCheckFlag()))
+ .collect(Collectors.toList());
+ if (unCompletenessList.isEmpty()) {
+ //榻愬鎬ф鏌ュ叏閮ㄩ�氳繃
+ resMap.put("completenessCheckFlag", true);
+ } else {
+ List<String> unCompletenessListMaterial = unCompletenessList.stream()
+ .map(i -> i.getMaterialNumber() + "[" + i.getMaterialName() + "]").collect(Collectors.toList());
+ //瀛樺湪鏈�氳繃
+ resMap.put("completenessCheckFlag", false);
+ resMap.put("unCompletenessCheckList", unCompletenessListMaterial);
+ }
+ }
+ //璁惧鐐规
+ List<EamInspectionOrder> inspectionOrderList = eamInspectionOrderService.list(new LambdaQueryWrapper<EamInspectionOrder>()
+ .eq(EamInspectionOrder::getWorkOrderId, workOrder.getId()));
+ if (inspectionOrderList.isEmpty()) {
+ //鏈墽琛岃繃璁惧鐐规
+ resMap.put("inspectionFlag", false);
+ } else {
+ List<String> unInspectEquipmentList = eamEquipmentService.list(new LambdaQueryWrapper<EamEquipment>()
+ .eq(EamEquipment::getOrgId, workOrder.getFactoryId())
+ .eq(EamEquipment::getDelFlag, CommonConstant.DEL_FLAG_0)
+ .apply("NOT EXISTS (SELECT 1 FROM eam_inspection_order t WHERE t.equipment_id = eam_equipment.id AND t.work_order_id = {0})", workOrder.getId())
+ .apply("EXISTS (SELECT 1 FROM eam_maintenance_standard t WHERE t.equipment_id = eam_equipment.id AND t.del_flag = {0} " +
+ "AND t.standard_status = {1} AND t.maintenance_category = {2})",
+ CommonConstant.DEL_FLAG_0, MaintenanceStandardStatusEnum.NORMAL.name(), MaintenanceCategoryEnum.POINT_INSPECTION.name()))
+ .stream().map(e -> e.getEquipmentCode() + "[" + e.getEquipmentName() + "]").collect(Collectors.toList());
+ if (unInspectEquipmentList.isEmpty()) {
+ //鍏ㄩ儴璁惧閮藉凡鐐规
+ resMap.put("equipmentInspectFlag", true);
+ } else {
+ //瀛樺湪鏈偣妫�鐨勮澶�
+ resMap.put("equipmentInspectFlag", false);
+ resMap.put("unInspectEquipmentList", unInspectEquipmentList);
+ }
+ }
+ //宸ヨ壓鐐规
+ List<EamProcessCheck> processCheckList = eamProcessCheckService.list(new LambdaQueryWrapper<EamProcessCheck>()
+ .eq(EamProcessCheck::getWorkOrderId, workOrder.getId()));
+ if (processCheckList.isEmpty()) {
+ //鏈墽琛岃繃宸ヨ壓鐐规
+ resMap.put("processCheckFlag", false);
+ } else {
+ List<String> unCheckEquipmentList = eamEquipmentService.list(new LambdaQueryWrapper<EamEquipment>()
+ .eq(EamEquipment::getOrgId, workOrder.getFactoryId())
+ .eq(EamEquipment::getDelFlag, CommonConstant.DEL_FLAG_0)
+ .apply("EXISTS (SELECT 1 FROM eam_equipment_process_parameters t WHERE t.equipment_id = eam_equipment.id)")
+ .apply("NOT EXISTS (SELECT 1 FROM eam_process_check t WHERE t.equipment_id = eam_equipment.id AND t.work_order_id = {0})", workOrder.getId()))
+ .stream().map(e -> e.getEquipmentCode() + "[" + e.getEquipmentName() + "]").collect(Collectors.toList());
+ if (unCheckEquipmentList.isEmpty()) {
+ //鍏ㄩ儴璁惧閮藉凡鐐规
+ resMap.put("processCheckFlag", true);
+ } else {
+ //瀛樺湪鏈偣妫�鐨勮澶�
+ resMap.put("processCheckFlag", false);
+ resMap.put("unCheckEquipmentList", unCheckEquipmentList);
+ }
+ }
+ return Result.ok(resMap);
+ }
+
/**
* 缂栬緫
*
--
Gitblit v1.9.3