From 510de9a7af542df4844649dee335622e18478c9a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 07 八月 2024 16:31:31 +0800
Subject: [PATCH] 新增MES采购入库上报功能
---
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 107 +++++++++++++++++++++++++++--------------------------
1 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index 8726947..b6e2b87 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -12,18 +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.entity.param.AgvTaskParam;
-import com.zy.asrs.entity.param.AgvTaskkDescribeParam;
+import com.zy.asrs.service.AgvWaitPakinService;
import com.zy.asrs.service.AgvWrkMastService;
-import com.zy.common.utils.HttpHandler;
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.*;
-import java.util.stream.Collectors;
@RestController
@RequestMapping("/agv")
@@ -31,6 +25,8 @@
@Autowired
AgvWrkMastService agvWrkMastService;
+ @Autowired
+ AgvWaitPakinService agvWaitPakinService;
@RequestMapping(value = "/wrkMast/{id}/auth")
@ManagerAuth
@@ -58,6 +54,31 @@
}else {
wrapper.orderBy("io_time", false);
}
+ Page<AgvWrkMast> agvWrkMastPage = agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(agvWrkMastPage);
+ }
+
+ @RequestMapping(value = "/wrkMast/list/auth/dbList")
+ @ManagerAuth
+ public R dbList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){
+ if (orderByField.endsWith("$")){
+ orderByField = orderByField.substring(0, orderByField.length()-1);
+ }
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }else {
+ wrapper.orderBy("io_time", false);
+ }
+ wrapper.in("io_type",108,111,112);
return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -161,50 +182,30 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMast/startWrk/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｅ紑濮嬩换鍔�")
- public R startWrk(@RequestParam String param) throws IOException {
- List<AgvWrkMast> agvWrkMastList = JSONArray.parseArray(param, AgvWrkMast.class);
- if (Cools.isEmpty(agvWrkMastList)){
- return R.error();
- }
-
- AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
- agvTaskCreateParam.setTaskType("putaway");
-
- List<AgvTaskParam> agvTaskParamList = agvWrkMastList.stream().map(agvWrkMast -> {
- AgvTaskParam agvTaskParam = new AgvTaskParam();
- AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
- agvTaskParam.setTaskDescribe(agvTaskkDescribeParam);
- //AgvTaskParam
- agvTaskParam.setTaskCode(agvWrkMast.getWrkNo().toString());
- agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
- //AgvTaskkDescribeParam
- agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
- agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
- agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
- return agvTaskParam;
- }).collect(Collectors.toList());
-
- agvTaskCreateParam.setTasks(agvTaskParamList);
-
- String response = new HttpHandler.Builder()
- .setUri("localhost:8080")
- .setPath("test/task/create")
- .setJson(JSONObject.toJSONString(agvTaskCreateParam))
- .build()
- .doPost();
-
- JSONObject jsonObject = JSON.parseObject(response);
- int code = (int) jsonObject.get("code");
-
- System.out.println(response);
-
- if(code == 0){
-
- }
-
-
- return R.ok();
- }
+// @RequestMapping(value = "/wrkMast/startWrk/auth")
+// @ManagerAuth(memo = "宸ヤ綔妗ｅ紑濮嬩换鍔�")
+// 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");
+//
+// int code = agvWrkMastService.containerMoveIn(agvWrkMastList);
+//
+// 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.error("浠诲姟鍚姩澶辫触");
+//
+// }
}
--
Gitblit v1.9.1