From 208bb2f289ce8a7b59f587a9f57e24c0fc8a0ba6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:48:40 +0800
Subject: [PATCH] MOM系统-9-24 加班
---
production-server/src/main/java/com/yuanchu/mom/controller/ManufactureOrderController.java | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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 4e64912..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
@@ -3,21 +3,27 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.mapper.ManualTechnologyMapper;
-import com.yuanchu.mom.pojo.ManualTechnology;
+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;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
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;
import java.util.Map;
@@ -35,11 +41,15 @@
@Autowired
private ManufactureOrderService manufactureOrderService;
+ @Autowired
+ private ManufactureSchedulingService manufactureSchedulingService;
+
@Resource
ManualTechnologyService manualTechnologyService;
@Resource
DeviceService deviceService;
+
@ApiOperation(value = "鏌ヨ鐢熶骇璁㈠崟鍒楄〃")
@ApiImplicitParams(value = {
@@ -59,7 +69,7 @@
return Result.success(map);
}
- @ApiOperation(value = "鎺掍骇-->1.鏌ョ湅")
+ @ApiOperation(value = "鐐瑰嚮鎺掍骇鑾峰彇琛ㄦ牸浜岀骇鏍�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true)
})
@@ -68,7 +78,16 @@
return Result.success(manualTechnologyService.seleDatil(manOrdId));
}
- @ApiOperation(value = "鎺掍骇-->2.閫夋嫨璁惧")
+ @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)
})
@@ -77,11 +96,40 @@
return Result.success(deviceService.getDeviceNameByGroup(deviceGroup));
}
- @ApiOperation(value = "鎺掍骇-->3.鏇存柊")
+ @ApiOperation(value = "鐐瑰嚮鎺掍骇-->纭畾鎸夐挳")
@PostMapping("/output")
- public Result output(String deviceGroup) {
- 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 = "manufactureOrderId", value = "璁㈠崟id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "schedulingId", value = "鎺掍骇Id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/down")
+ public Result<?> down(Integer manufactureOrderId, Integer schedulingId) {
+ manufactureOrderService.down(manufactureOrderId, schedulingId);
+ 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