From 5b999730e081bb5ba934ebf361280ca477a0e714 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 14 八月 2025 17:03:04 +0800
Subject: [PATCH] 工厂建模功能调整
---
src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 3f2cbac..b0321ff 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
@@ -167,8 +167,8 @@
@PostMapping(value = "/republish")
public Result<String> republish(@RequestBody MesProductionWorkOrderRepublishRequest request) {
MesProductionWorkOrder workOrder = mesProductionWorkOrderService.getById(request.getId());
- //todo 鍒ゆ柇鐝鏄惁缁撴潫鐨勯�昏緫
- if (!ProductionWorkOrderStatus.PUBLISHED.name().equals(workOrder.getWorkOrderStatus())) {
+ if (ProductionWorkOrderStatus.NEW.name().equals(workOrder.getWorkOrderStatus())
+ || ProductionWorkOrderStatus.CLOSED.name().equals(workOrder.getWorkOrderStatus())) {
return Result.error("褰撳墠宸ュ崟鐘舵�佷笉鏀寔閲嶅彂甯冿紒");
}
MesProductionWorkOrder republish = new MesProductionWorkOrder()
@@ -176,12 +176,27 @@
.setPlanQuantity(request.getPlanQuantity())
.setRepublisher(Objects.requireNonNull(getCurrentUser()).getUsername())
.setRepublishTime(new Date())
- .setRepublishReason(request.getRepublishReason())
- .setWorkOrderStatus(ProductionWorkOrderStatus.REPUBLISHED.name());
+ .setRepublishReason(request.getRepublishReason());
mesProductionWorkOrderService.updateById(republish);
return Result.ok("閲嶅彂甯冩垚鍔燂紒");
}
+ @AutoLog(value = "鎺掍骇宸ュ崟-鎵ц鎺掍骇宸ュ崟璁″垝")
+ @ApiOperation(value = "鎺掍骇宸ュ崟-鎵ц鎺掍骇宸ュ崟璁″垝", notes = "鎺掍骇宸ュ崟-鎵ц鎺掍骇宸ュ崟璁″垝")
+ @GetMapping(value = "/execute")
+ public Result<?> execute(@RequestParam("id") String id) {
+ MesProductionWorkOrder workOrder = mesProductionWorkOrderService.getById(id);
+ if (!ProductionWorkOrderStatus.PUBLISHED.name().equals(workOrder.getWorkOrderStatus())) {
+ return Result.error("褰撳墠宸ュ崟鐘舵�佷笉鑳芥墽琛岋紒");
+ }
+ //todo 榻愬鎬ф鏌ャ�佸伐鑹虹偣妫�銆佽澶囩偣妫� 鐨勬牎楠岄�昏緫
+ MesProductionWorkOrder executeOrder = new MesProductionWorkOrder()
+ .setId(id)
+ .setWorkOrderStatus(ProductionWorkOrderStatus.EXECUTING.name());
+ mesProductionWorkOrderService.updateById(executeOrder);
+ return Result.ok("鎵ц鎴愬姛锛�");
+ }
+
/**
* 缂栬緫
*
--
Gitblit v1.9.3