From ce34a29ce04ce600c8837cdc215a90500f24d323 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 11 十二月 2025 08:55:51 +0800
Subject: [PATCH] #AGV
---
src/main/java/com/zy/asrs/controller/OpenController.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 28c0cba..0225ee2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,21 +1,25 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.Task;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.TaskService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -33,8 +37,78 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private TaskService taskService;
+
+
+
+ @PostMapping("/agvPickupComplete/agvCallback")
+ @AppAuth(memo = "AGV鍙栬揣瀹屾垚鎺ュ彛")
+ public Map<String, Object> agvPickupComplete(@RequestBody AgvTaskParam agvTaskParam, HttpServletRequest request) {
+ // DecimalFormat df = new DecimalFormat("0000");
+ // String wrkNo = "Ctu"+df.format(param.getWrkNo())+date.getTime()/1000;
+ String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ if (Cools.isEmpty(task)) {
+ log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
+ }
+ task.setWrkSts(0L);
+ taskService.updateById(task);
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("code","0");
+ map.put("message","鎴愬姛");
+ map.put("reqCode", "");
+ log.info("agv璇锋眰鍙栬揣瀹屾垚锛寃ms浠诲姟鍙�:"+ JSON.toJSONString(agvTaskParam));
+ return map;
+
+ }
+
+ @PostMapping("/agvTaskComplete/agvCallback")
+ @AppAuth(memo = "AGV鏀捐揣瀹屾垚鎺ュ彛")
+ public Map<String, Object> agvTaskComplete(@RequestBody AgvTaskParam agvTaskParam,HttpServletRequest request) {
+ HashMap<String, Object> map = new HashMap<>();
+ String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ if (Cools.isEmpty(task)) {
+ log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
+ }
+
+ taskService.updateById(task);
+ if (task.getIoType() < 100 ){
+ task.setWrkSts(4L);
+ }else {
+ task.setWrkSts(14L);
+ }
+
+ taskService.updateById(task);
+
+ map.put("code","0");
+ map.put("message","鎴愬姛");
+ map.put("reqCode", "");
+ return map;
+ }
+
+ @PostMapping("/order/matSync/default/v2")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam.MatParam param,
+ HttpServletRequest request){
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ objects.add(param);
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
+ return R.ok();
+ }
+
@PostMapping("/order/matSync/default/v1")
- @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
HttpServletRequest request){
@@ -63,6 +137,24 @@
// return R.ok();
// }
+ @PostMapping("/order/adjustment/default/v1")
+ public synchronized R adjustmentOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenAdjustmentOrderParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.adjustmentOrderCreate(param);
+ return R.ok();
+ }
+
/**
* 娣诲姞鍏ュ簱鍗�
*/
@@ -90,7 +182,7 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakin/complete/default/v1")
+// @PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) OpenOrderCompleteParam param,
HttpServletRequest request) {
@@ -126,7 +218,7 @@
/**
* 鍑哄簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakout/complete/default/v1")
+// @PostMapping("/order/pakout/complete/default/v1")
public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) OpenOrderCompleteParam param,
HttpServletRequest request) {
--
Gitblit v1.9.1