From 73db5fb7f98e13e37ff5f43ec8977fb1f0cfcb9b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 25 七月 2024 12:34:34 +0800
Subject: [PATCH] 大理片:修改进片逻辑，卧转立启动，详情表中新增一条状态为0的玻璃信息，进片任务完成后将状态改为100 下片：下片异常问题解决
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
index 9836cf1..582dafe 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
@@ -1,16 +1,15 @@
package com.mes.work_assignment.controller;
-import cn.hutool.core.date.DateTime;
-import com.mes.damage.service.DamageService;
import com.mes.utils.Result;
+import com.mes.work_assignment.entity.WorkAssignment;
import com.mes.work_assignment.service.WorkAssignmentService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
/**
* <p>
@@ -20,17 +19,24 @@
* @author wu
* @since 2024-07-01
*/
+@Api(description = "鍊肩彮淇℃伅")
@RestController
-@RequestMapping("/work_assignment/work-assignment")
+@RequestMapping("/work_assignment")
public class WorkAssignmentController {
@Autowired
private WorkAssignmentService workAssignmentService;
- @ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
- @GetMapping("/selectWorkAssignment")
- public Result selectDamage(int line,String workingProcedure) {
+ @ApiOperation("鍊肩彮鏁版嵁鏌ヨ")
+ @PostMapping("/selectWorkAssignment")
+ public Result selectWorkAssignment(int line,String workingProcedure) {
return Result.build(200,"鏌ヨ鎴愬姛",workAssignmentService.selectWorkAssignment(line,workingProcedure));
}
+ @ApiOperation("鍊肩彮鏁版嵁淇敼")
+ @PostMapping("/updateWorkAssignment")
+ public Result updateWorkAssignment(@RequestBody List<WorkAssignment> workAssignmentList) {
+ workAssignmentService.saveOrUpdateBatch(workAssignmentList);
+ return Result.build(200,"淇敼鎴愬姛",1);
+ }
}
--
Gitblit v1.8.0