From b97ab3e077df3665663eb3a5b0c23d54c83a5548 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期五, 31 五月 2024 12:02:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvWorkController.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWorkController.java b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
index a648f60..1b1417d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
@@ -1,32 +1,60 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONArray;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
-import com.zy.asrs.entity.AgvWaitPakin;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.service.AgvWorkService;
-import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
-@RequestMapping("agvWork")
+@RequestMapping("agv")
public class AgvWorkController extends BaseController {
@Autowired
private AgvWorkService workService;
+ //TODO 绉诲姩鍒癆gvBasDevpController涓嬮潰
@RequestMapping("/create/waitPain/wrkMast/start")
@ManagerAuth(memo = "鐢熸垚浠诲姟")
- public R createWaitPainWrkMastStart(@RequestBody List<AgvWaitPakin> list) {
- //StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
+ public R createWaitPainWrkMastStart(@RequestParam String param) {
+
+ List<AgvBasDevp> agvBasDevpList = JSONArray.parseArray(param, AgvBasDevp.class);
+
+ workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
//return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
- return null;
+ return R.ok("鐢熸垚鍏ュ簱宸ヤ綔妗ｆ垚鍔�");
+ }
+
+ @RequestMapping("/locDdetl/adjust/start")
+ @ManagerAuth(memo = "")
+ public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
+ workService.adjustLocDetl(param, getUserId());
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
+ }
+
+ @RequestMapping("/hand/control/wrkMast")
+ @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
+ public R handControlWrkMast(@RequestParam String workNo,
+ @RequestParam Integer type){
+ if (type == 1) {
+ workService.completeWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
+ } else if (type == 2) {
+ workService.cancelWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ workService.changeToOutWrkMast(workNo,getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡杞垚鍑哄簱浠诲姟锛屽苟涓斿鍣ㄧ鍦烘垚鍔�");
+ }
+ return R.ok();
}
}
--
Gitblit v1.9.1