From aea629d098bdab0918d90e0c51af9d7b099bca12 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 五月 2024 20:45:51 +0800
Subject: [PATCH] #新旧物料更新接口
---
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index fd5a1cd..56c60df 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -11,12 +11,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.AgvWrkMast;
-import com.zy.asrs.entity.param.AgvTaskCreateParam;
+import com.zy.asrs.service.AgvWaitPakinService;
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.util.*;
@RestController
@@ -25,6 +26,8 @@
@Autowired
AgvWrkMastService agvWrkMastService;
+ @Autowired
+ AgvWaitPakinService agvWaitPakinService;
@RequestMapping(value = "/wrkMast/{id}/auth")
@ManagerAuth
@@ -157,23 +160,28 @@
@RequestMapping(value = "/wrkMast/startWrk/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ紑濮嬩换鍔�")
- public R startWrk(@RequestParam String param){
+ public R startWrk(@RequestParam String param) throws IOException {
List<AgvWrkMast> agvWrkMastList = JSONArray.parseArray(param, AgvWrkMast.class);
if (Cools.isEmpty(agvWrkMastList)){
return R.error();
}
+ int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");
- AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
+ int code = agvWrkMastService.containerMoveIn(agvWrkMastList);
-// agvWrkMastList.stream().map(agvWrkMast -> {
-// AgvTaskParam agvTaskParam = new AgvTaskParam();
-// AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
-// agvTaskParam.setTaskCode(agvWrkMast.getWrkNo().toString());
-// agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
-// agvTaskParam.setTaskkDescribe(agvTaskkDescribeParam);
-// agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.);
-// }).collect(Collectors.toList());
+ if(code == 0){
+ agvWrkMastList.forEach(agvWrkMast -> {
+ //202.RCS鍙栬揣涓�
+ agvWrkMast.setWrkSts((long)202);
+ //淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
+ agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
+ });
+ agvWrkMastService.updateBatchById(agvWrkMastList);
- return R.ok();
+ return R.ok("浠诲姟鍚姩鎴愬姛");
+ }
+
+ return R.error("浠诲姟鍚姩澶辫触");
+
}
}
--
Gitblit v1.9.1