From f6200ebe355ac91ca2e1a261dd6d2237f3d046b6 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 06 四月 2026 16:06:11 +0800
Subject: [PATCH] 托盘报错增加显示
---
src/main/java/com/zy/asrs/controller/OpenController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 14571f4..cd094a2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -153,6 +153,7 @@
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("[auth] cache: {}", obj == null ? "null" : JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
@@ -398,8 +399,12 @@
@PostMapping("/order/matSync/default/v2")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){
-
+ public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param,
+ HttpServletRequest request) {
+ if (request != null) {
+ log.info("[syncMatInfoV2] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
System.out.println(param);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -424,7 +429,12 @@
* return
*/
@PostMapping("/station/all")
- public synchronized R stationAll(){
+ public synchronized R stationAll(HttpServletRequest request) {
+ if (request != null) {
+ String cachePayload = JSON.toJSONString(Collections.singletonMap("op", "stationAll"));
+ log.info("[stationAll] cache: {}", cachePayload);
+ request.setAttribute("cache", cachePayload);
+ }
return openService.stationAll();
}
@@ -433,7 +443,11 @@
* return
*/
@PostMapping("/comb/auth")
- public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
+ public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[comb] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
List<MesToCombParam> errorComb = Lists.newArrayList();
List<MesToCombParam> validComb = Lists.newArrayList();
for (MesToCombParam mesToCombParam : param) {
@@ -477,10 +491,12 @@
*/
@PostMapping("/outOrder")
- public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
if (Cools.isEmpty(params)) {
return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
+ log.info("[outOrder] cache: {}", JSON.toJSONString(params));
+ request.setAttribute("cache", params);
Set<String> orderIds = new LinkedHashSet<>();
for (OutTaskParam outTaskParam : params) {
if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
@@ -506,7 +522,7 @@
Collections.sort(seqs);
for (int i = 0; i < seqs.size(); i++) {
if (!String.valueOf(seqs.get(i)).equals(String.valueOf(i + 1))) {
- return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉杩炵画");
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉杩炶疮");
}
}
}
@@ -550,7 +566,6 @@
}
validOutOrders.add(outTaskParam);
}
-
for (OutTaskParam outTaskParam : validOutOrders) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", outTaskParam.getPalletId()));
if (locMast == null) {
@@ -558,8 +573,19 @@
}
}
- if(errorOutOrders.size() > 0) {
- return R.error("搴撳瓨涓笉瀛樺湪璇ユ墭鐩�").add(errorOutOrders);
+ for (OutTaskParam outTaskParam : validOutOrders) {
+ R r = openService.outOrder(outTaskParam,validOutOrders.size());
+ if (!r.get("code").equals(200)){
+ return r;
+ }
+ }
+ if (errorOutOrders.size() > 0) {
+ List<String> missingPalletIds = new ArrayList<>(errorOutOrders.size());
+ for (OutTaskParam p : errorOutOrders) {
+ String pid = p.getPalletId();
+ missingPalletIds.add(Cools.isEmpty(pid) ? "锛堢┖锛�" : pid);
+ }
+ return R.error("搴撳瓨涓笉瀛樺湪璇ユ墭鐩橈細" + String.join("锛�", missingPalletIds)).add(errorOutOrders);
}
return R.ok();
@@ -569,7 +595,11 @@
* pause out order
*/
@PostMapping("/order/pakout/pause/default/v1")
- public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param){
+ public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[pakoutOrderPause] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) {
return R.error("orderNo is empty");
}
@@ -691,7 +721,11 @@
* 浠诲姟鏌ヨ鎺ュ彛
*/
@PostMapping("/queryTask")
- public synchronized R queryTask(@RequestBody QueryTaskParam param) {
+ public synchronized R queryTask(@RequestBody QueryTaskParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[queryTask] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
--
Gitblit v1.9.1