From b0ae9e5d1c8add200ded8957c068223b9703c1e3 Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期三, 27 八月 2025 18:00:09 +0800
Subject: [PATCH] feat(cms): 为 RatedLife 实体添加字典注解- 在 RatedLife 实体的 cuttingId 字段上添加了 @Dict 注解 - 优化了 RatedLifeController 中的代码格式和注释
---
src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
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 c021299..d86777d 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
@@ -38,7 +38,7 @@
*/
@Api(tags = "鎺掍骇宸ュ崟")
@RestController
-@RequestMapping("/mesproductionworkorder/mesProductionWorkOrder")
+@RequestMapping("/mes/mesProductionWorkOrder")
@Slf4j
public class MesProductionWorkOrderController extends JeecgController<MesProductionWorkOrder, IMesProductionWorkOrderService> {
@Autowired
@@ -204,10 +204,12 @@
@GetMapping(value = "/execute")
public Result<?> execute(@RequestParam("id") String id) {
MesProductionWorkOrder workOrder = mesProductionWorkOrderService.getById(id);
- if (!ProductionWorkOrderStatus.PUBLISHED.name().equals(workOrder.getWorkOrderStatus())) {
+ 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())) {
return Result.error("褰撳墠宸ュ崟鐘舵�佷笉鑳芥墽琛岋紒");
}
- //todo 榻愬鎬ф鏌ャ�佸伐鑹虹偣妫�銆佽澶囩偣妫� 鐨勬牎楠岄�昏緫
MesProductionWorkOrder executeOrder = new MesProductionWorkOrder()
.setId(id)
.setWorkOrderStatus(ProductionWorkOrderStatus.EXECUTING.name());
--
Gitblit v1.9.3