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/ManufactureOrderController.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 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 dd36134..5fbc557 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
@@ -6,6 +6,8 @@
import com.yuanchu.mom.pojo.dto.ManualTechnologyDto;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.service.ManualTechnologyService;
+import com.yuanchu.mom.service.ManufactureSchedulingService;
+import com.yuanchu.mom.utils.MyUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -39,11 +41,15 @@
@Autowired
private ManufactureOrderService manufactureOrderService;
+ @Autowired
+ private ManufactureSchedulingService manufactureSchedulingService;
+
@Resource
ManualTechnologyService manualTechnologyService;
@Resource
DeviceService deviceService;
+
@ApiOperation(value = "鏌ヨ鐢熶骇璁㈠崟鍒楄〃")
@ApiImplicitParams(value = {
@@ -72,6 +78,15 @@
return Result.success(manualTechnologyService.seleDatil(manOrdId));
}
+ @ApiOperation(value = "鐐瑰嚮鏌ョ湅鎺掍骇")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/select_Scheduling")
+ public Result<?> selectScheduling(Integer manOrdId) {
+ return Result.success(manufactureSchedulingService.selectScheduling(manOrdId));
+ }
+
@ApiOperation(value = "鐐瑰嚮鎺掍骇-->浜岀骇鏍戦�夋嫨璁惧")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "deviceGroup", value = "璁惧缁�", dataTypeClass = String.class, required = true)
@@ -82,28 +97,28 @@
}
@ApiOperation(value = "鐐瑰嚮鎺掍骇-->纭畾鎸夐挳")
- @ApiImplicitParams(value = {
- @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(@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("鎺掍骇鎴愬姛锛�");
+ public Result<?> output(@Validated @RequestBody ManualTechnologyDto manualTechnologyDto) throws ParseException {
+ // 鍒ゆ柇杈撳叆鏁伴噺鏄惁瓒呭嚭
+ Integer isExceed = manufactureOrderService.checkScheduled(manualTechnologyDto.getManOrdId(), manualTechnologyDto.getSchedulingNumber());
+ if (isExceed >= 0){
+ manualTechnologyService.output(manualTechnologyDto);
+ return Result.success("鎺掍骇鎴愬姛锛�");
+ } else {
+ MyUtil.PrintLog(isExceed.toString());
+ int i = manualTechnologyDto.getSchedulingNumber() + isExceed;
+ return Result.fail("鎺掍骇閿欒锛屽綋鍓嶅墿浣欐帓浜т负锛�" + i);
+ }
}
@ApiOperation(value = "涓嬭揪")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "manufactureOrderId", value = "璁㈠崟id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "schedulingId", value = "鎺掍骇Id", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/down")
- public Result<?> down(Integer manOrdId) {
- manufactureOrderService.down(manOrdId);
+ public Result<?> down(Integer manufactureOrderId, Integer schedulingId) {
+ manufactureOrderService.down(manufactureOrderId, schedulingId);
return Result.success("涓嬭揪鎴愬姛!");
}
--
Gitblit v1.9.3