From 7fecdd4f27d9d664cb0de5ee2b1dd7d6bbf9f1d2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 13 九月 2024 08:07:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
index 9cad4da..4ded016 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
@@ -19,10 +19,11 @@
* @since 2024-08-28
*/
@RestController
- @RequestMapping("/jiumumes/tasking")
+ @RequestMapping("/tasking")
public class TaskingController {
@Autowired
private TaskingService taskingService;
+
@ApiOperation("鍒囨崲妯″紡")
@PostMapping("/updateLoadState") //鍒囨崲妯″紡"
@ResponseBody
@@ -65,5 +66,45 @@
List<Tasking> tasking =taskingService.selectTasking();
return Result.build(1,"瀹氬埗妯″紡",tasking);
}
+
+ @ApiOperation("鏌ヨ褰撳墠宸ヨ壓锛屾煇宸ヤ綔鐘舵�佺殑绾夸笂浠诲姟")
+ @PostMapping("/findCraftTasking")
+ @ResponseBody
+ public Result findCraftTasking(@RequestBody Tasking tasking) {
+ List<Tasking> list =taskingService.findCraftTasking(tasking);
+ return Result.build(200,"鎴愬姛",list);
+ }
+
+ @ApiOperation("淇敼浠诲姟鐘舵�� 銆愮牬鎹�/澶辫触/瀹屽伐銆�")
+ @PostMapping("/updateCraftTasking")
+ @ResponseBody
+ public Result updateCraftTasking(@RequestBody Tasking tasking) {
+ int count =taskingService.updateCraftTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+ @ApiOperation("淇敼褰撳墠璁惧 銆愬紑宸�/鏆傚仠銆�")
+ @PostMapping("/updateMachineState")
+ @ResponseBody
+ public Result updateMachineState(@RequestBody Tasking tasking) {
+ int count =taskingService.updateCraftTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+ @ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
+ @PostMapping("/updateTopLine")
+ @ResponseBody
+ public Result updateTopLine(@RequestBody Tasking tasking) {
+ int count =taskingService.updateCraftTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+
+ @ApiOperation("淇敼褰撳墠璁惧 銆愪笅绾裤��")
+ @PostMapping("/updateDownLine")
+ @ResponseBody
+ public Result updateDownLine(@RequestBody Tasking tasking) {
+ int count =taskingService.updateCraftTasking(tasking);
+ return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
+ }
+
+
}
--
Gitblit v1.8.0