From 3b7f72ee9c450955ecef1897d10d27e547f20476 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 17:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/java/com/yuanchu/mom/controller/ProductionPlanController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/controller/ProductionPlanController.java b/production-server/src/main/java/com/yuanchu/mom/controller/ProductionPlanController.java
index ea39bc1..00b2450 100644
--- a/production-server/src/main/java/com/yuanchu/mom/controller/ProductionPlanController.java
+++ b/production-server/src/main/java/com/yuanchu/mom/controller/ProductionPlanController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
import com.yuanchu.mom.service.ManualTechnologyService;
+import com.yuanchu.mom.service.ManufactureOrderProcessService;
import com.yuanchu.mom.service.ManufactureOrderService;
import com.yuanchu.mom.service.ManufactureSchedulingService;
import com.yuanchu.mom.vo.Result;
@@ -27,6 +28,8 @@
@Autowired
private ManufactureSchedulingService manufactureSchedulingService;
+ @Autowired
+ private ManufactureOrderProcessService manufactureOrderProcessService;
@ApiOperation(value = "浜岀骇鏍�")
@GetMapping("/tow_tree")
@@ -60,11 +63,12 @@
@ApiOperation(value = "鏌ョ湅鎺掍骇璇︽儏-->澶辩劍淇敼鏃堕棿")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "technologyId", value = "宸ュ簭Id", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "startTime", value = "寮�濮嬫椂闂�", dataTypeClass = String.class, required = true, dataType = "date"),
+ @ApiImplicitParam(name = "schedulingId", value = "鎺掍骇Id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "startTime", value = "寮�濮嬫椂闂�", dataTypeClass = String.class, required = true, dataType = "date")
})
@GetMapping("/update_time")
- public Result<?> updateTime(Integer technologyId, String startTime) {
- Integer isUpdateSuccess = manualTechnologyService.updateTime(technologyId, startTime);
+ public Result<?> updateTime(Integer technologyId, Integer schedulingId, String startTime) {
+ Integer isUpdateSuccess = manufactureOrderProcessService.updateTime(technologyId, schedulingId, startTime);
if (isUpdateSuccess >= 1) {
return Result.success("鏇存柊鎴愬姛锛�");
}
--
Gitblit v1.9.3