From d55581ed00fd0a8ecce78a6ebe6f9e2ee86274b3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 04 八月 2023 17:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/controller/AgvWorkController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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..67dcb26 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
@@ -1,32 +1,35 @@
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.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());
//return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
- return null;
+ return R.ok("鐢熸垚鍏ュ簱宸ヤ綔妗ｆ垚鍔�");
+
}
}
--
Gitblit v1.9.1