From 55e5fcc8df938fefc94103149dfe3acd328abfd6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 18:00:54 +0800
Subject: [PATCH] MOM系统-8-30
---
production-server/src/main/java/com/yuanchu/mom/controller/ManufactureOrderController.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/controller/ManufactureOrderController.java b/production-server/src/main/java/com/yuanchu/mom/controller/ManufactureOrderController.java
index 707afee..dd36134 100644
--- a/production-server/src/main/java/com/yuanchu/mom/controller/ManufactureOrderController.java
+++ b/production-server/src/main/java/com/yuanchu/mom/controller/ManufactureOrderController.java
@@ -17,6 +17,8 @@
import com.yuanchu.mom.service.ManufactureOrderService;
import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
@@ -61,7 +63,7 @@
return Result.success(map);
}
- @ApiOperation(value = "鎺掍骇-->1.鏌ョ湅")
+ @ApiOperation(value = "鐐瑰嚮鎺掍骇鑾峰彇琛ㄦ牸浜岀骇鏍�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true)
})
@@ -70,7 +72,7 @@
return Result.success(manualTechnologyService.seleDatil(manOrdId));
}
- @ApiOperation(value = "鎺掍骇-->2.閫夋嫨璁惧")
+ @ApiOperation(value = "鐐瑰嚮鎺掍骇-->浜岀骇鏍戦�夋嫨璁惧")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "deviceGroup", value = "璁惧缁�", dataTypeClass = String.class, required = true)
})
@@ -79,23 +81,20 @@
return Result.success(deviceService.getDeviceNameByGroup(deviceGroup));
}
- @ApiOperation(value = "鎺掍骇-->3.鏇存柊")
+ @ApiOperation(value = "鐐瑰嚮鎺掍骇-->纭畾鎸夐挳")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "date", value = "鎺掍骇寮�濮嬫棩鏈�", dataTypeClass = String.class, required = true)
+ @ApiImplicitParam(name = "date", value = "鎺掍骇寮�濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟Id", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "schedulingNumber", value = "鎺掍骇鏁伴噺", dataTypeClass = Integer.class, required = true),
})
@PostMapping("/output")
- public Result output(String date ,@Validated @RequestBody List<ManualTechnologyDto> manualTechnologyDtoList) throws ParseException {
- manualTechnologyService.output(date,manualTechnologyDtoList);
- return Result.success();
- }
-
- @ApiOperation(value = "鏌ョ湅鎺掍骇璇︽儏")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/sePros")
- public Result sePros(Integer manOrdId) {
- return Result.success(manufactureOrderService.sePros(manOrdId));
+ public Result<?> output(@RequestParam(value = "date") @NotBlank(message = "鎺掍骇寮�濮嬫棩鏈熶笉鑳戒负绌�") String date,
+ @RequestParam(value = "manOrdId") @NotNull(message = "鐢熶骇璁㈠崟Id涓嶈兘涓虹┖") Integer manOrdId,
+ @RequestParam(value = "schedulingNumber") @NotNull(message = "鎺掍骇鏁伴噺涓嶈兘涓虹┖") Integer schedulingNumber,
+ @Validated @RequestBody List<ManualTechnologyDto> manualTechnologyDtoList
+ ) throws ParseException {
+ manualTechnologyService.output(date, manOrdId, schedulingNumber, manualTechnologyDtoList);
+ return Result.success("鎺掍骇鎴愬姛锛�");
}
@ApiOperation(value = "涓嬭揪")
@@ -103,10 +102,19 @@
@ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/down")
- public Result down(Integer manOrdId) {
+ public Result<?> down(Integer manOrdId) {
manufactureOrderService.down(manOrdId);
return Result.success("涓嬭揪鎴愬姛!");
}
+ @ApiOperation(value = "澶氶�夊垹闄�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = String.class, dataType = "list", required = true)
+ })
+ @DeleteMapping("/delete")
+ public Result<?> deleteManufacture(List<String> manOrdId) {
+ manufactureOrderService.deleteManufacture(manOrdId);
+ return Result.success("鍒犻櫎鎴愬姛!");
+ }
}
--
Gitblit v1.9.3