From 75b2904fbaf4fab6a9fb3baf065d2c927cc7a7a2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 九月 2023 18:16:34 +0800
Subject: [PATCH] 基础数据-物料清单维护-导出
---
production-server/src/main/java/com/yuanchu/mom/controller/ManufactureOrderController.java | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 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..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;
@@ -17,6 +19,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;
@@ -37,11 +41,15 @@
@Autowired
private ManufactureOrderService manufactureOrderService;
+ @Autowired
+ private ManufactureSchedulingService manufactureSchedulingService;
+
@Resource
ManualTechnologyService manualTechnologyService;
@Resource
DeviceService deviceService;
+
@ApiOperation(value = "鏌ヨ鐢熶骇璁㈠崟鍒楄〃")
@ApiImplicitParams(value = {
@@ -61,7 +69,7 @@
return Result.success(map);
}
- @ApiOperation(value = "鎺掍骇-->1.鏌ョ湅")
+ @ApiOperation(value = "鐐瑰嚮鎺掍骇鑾峰彇琛ㄦ牸浜岀骇鏍�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "manOrdId", value = "鐢熶骇璁㈠崟id", dataTypeClass = Integer.class, required = true)
})
@@ -70,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)
})
@@ -79,34 +96,40 @@
return Result.success(deviceService.getDeviceNameByGroup(deviceGroup));
}
- @ApiOperation(value = "鎺掍骇-->3.鏇存柊")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "date", value = "鎺掍骇寮�濮嬫棩鏈�", dataTypeClass = String.class, required = true)
- })
+ @ApiOperation(value = "鐐瑰嚮鎺掍骇-->纭畾鎸夐挳")
@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(@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("涓嬭揪鎴愬姛!");
}
+ @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