From aa0c2969838c2a794d9a45da7d4b67c5f6cb70a5 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 01 一月 2026 15:23:13 +0800
Subject: [PATCH] AGV回调
---
src/main/java/com/zy/asrs/controller/OpenController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f1a90fe..d52fdc8 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,10 +4,16 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.zy.asrs.entity.AgvCallbackDto;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.param.MatSyncParam;
+import com.zy.asrs.entity.param.OpenLocDetlQueryParam;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesPakinParam;
@@ -17,10 +23,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -38,6 +46,20 @@
@Autowired
private OpenService openService;
+ @Resource
+ private LocDetlService locDetlService;
+
+ @PostMapping("/api/agv_callback")
+ @AppAuth(memo = "agv浠诲姟鍥炶皟")
+ public synchronized R agvCallback(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) AgvCallbackDto param,
+ HttpServletRequest request) {
+
+ auth(appkey, param, request);
+
+ return openService.agvCallback(param);
+ }
+
// 鍏ュ簱瀹屾垚涓婃姤娴嬭瘯鎺ュ彛
@PostMapping("/inOrderFinishReport")
public synchronized R inOrderFinishReport(@RequestHeader(required = false) String appkey,
@@ -51,6 +73,15 @@
public synchronized R outOrderFinishReport(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MesPakoutParam param,
HttpServletRequest request) {
+ return R.ok();
+ }
+
+ //鍛煎彨agv娴嬭瘯鎺ュ彛
+ @PostMapping("/api/entity/create/one")
+ @AppAuth(memo = "鍛煎彨agv娴嬭瘯鎺ュ彛")
+ public synchronized R create(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MesPakoutParam param,
+ HttpServletRequest request) {
return R.ok();
}
@@ -191,6 +222,32 @@
return R.ok().add(openService.queryStock());
}
+ /**
+ * 搴撳瓨鏄庣粏鏌ヨ
+ */
+ @PostMapping("/locDetl/list/default/v1")
+ @AppAuth(memo = "搴撳瓨鏄庣粏鏌ヨ")
+ public R queryLocDetlList(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenLocDetlQueryParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ Map<String, Object> paramMap = param.toQueryMap();
+ excludeTrash(paramMap);
+ param.convertToWrapper(wrapper);
+ allLike(LocDetl.class, paramMap.keySet(), wrapper, param.getCondition());
+ if (!Cools.isEmpty(param.getOrderByField())) {
+ wrapper.orderBy(humpToLine(param.getOrderByField()), "asc".equals(param.getOrderByType()));
+ }
+ Integer curr = param.getCurr() != null ? param.getCurr() : 1;
+ Integer limit = param.getLimit() != null ? param.getLimit() : 10;
+ return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
--
Gitblit v1.9.1