From 8e39c9bbf8a8bb4707f2a766295b40497ae96706 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:46:54 +0800
Subject: [PATCH] MOM系统-9-01 生产订单 生产计划完成
---
production-server/src/main/java/com/yuanchu/mom/controller/ProductionPlanController.java | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 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 2b0cf45..ea39bc1 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,7 +1,8 @@
package com.yuanchu.mom.controller;
+import com.yuanchu.mom.service.ManualTechnologyService;
import com.yuanchu.mom.service.ManufactureOrderService;
-import com.yuanchu.mom.service.ProductionPlanService;
+import com.yuanchu.mom.service.ManufactureSchedulingService;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -12,31 +13,20 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-
@Api(tags = "鐢熶骇绠＄悊-->鐢熶骇璁″垝")
@RestController
@RequestMapping("/productionPlan")
public class ProductionPlanController {
- @Resource
- ProductionPlanService productionPlanService;
+ @Autowired
+ private ManualTechnologyService manualTechnologyService;
@Autowired
private ManufactureOrderService manufactureOrderService;
- @ApiOperation(value = "鏌ヨ鐢熶骇璁″垝鍒楄〃")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "deviceId", value = "璁惧id", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "orderCode", value = "璁㈠崟鍙�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "startTime", value = "璁″垝寮�濮嬫棩鏈�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "endTime", value = "璁″垝缁撴潫鏃ユ湡", dataTypeClass = String.class)
- })
- @GetMapping("/selectAllPlan")
- public Result selectAllPlan(Integer deviceId, String orderCode, String name, String startTime, String endTime) {
- return Result.success(productionPlanService.selectAllPlan(deviceId,orderCode,name,startTime,endTime));
- }
+ @Autowired
+ private ManufactureSchedulingService manufactureSchedulingService;
+
@ApiOperation(value = "浜岀骇鏍�")
@GetMapping("/tow_tree")
@@ -46,10 +36,38 @@
@ApiOperation(value = "鏌ョ湅鎺掍骇璇︽儏")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "schedulingId", value = "鎺掍骇id", dataTypeClass = Integer.class, required = true)
})
@GetMapping("/sePros")
- public Result sePros(Integer manOrdId) {
- return Result.success(manufactureOrderService.sePros(manOrdId));
+ public Result<?> sePros(Integer schedulingId) {
+ return Result.success(manufactureOrderService.sePros(schedulingId));
+ }
+
+
+ @ApiOperation(value = "鏍规嵁鐢熶骇璁㈠崟鏌ョ湅鐢熶骇璁″垝")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "productName", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "startTime", value = "寮�濮嬫棩鏈�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "endTime", value = "缁撴潫鏃ユ湡", dataTypeClass = String.class)
+ })
+ @GetMapping("/produceTable")
+ public Result<?> selectProduceTable(Integer manOrdId, String productName, String startTime, String endTime) {
+ return Result.success(manufactureSchedulingService.selectProduceTable(manOrdId, productName, startTime, endTime));
+ }
+
+
+ @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"),
+ })
+ @GetMapping("/update_time")
+ public Result<?> updateTime(Integer technologyId, String startTime) {
+ Integer isUpdateSuccess = manualTechnologyService.updateTime(technologyId, startTime);
+ if (isUpdateSuccess >= 1) {
+ return Result.success("鏇存柊鎴愬姛锛�");
+ }
+ return Result.fail("鏇存柊澶辫触锛�");
}
}
--
Gitblit v1.9.3