From 1664adb595a7539325f46a85ee7e80e4023e4302 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 14:15:31 +0800
Subject: [PATCH] *分拣流程orderNo由唯一降级为不唯一
---
src/main/java/com/zy/asrs/controller/OpenController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e2e0f5b..25f2539 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -243,16 +243,23 @@
if (Cools.isEmpty(param.getUpc())) {
return R.error("UPC[upc]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getSupplier())) {
- return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getItem())) {
+ return R.error("UPC[item]涓嶈兘涓虹┖");
}
+// if (Cools.isEmpty(param.getSupplier())) {
+// return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
+// }
if (Cools.isEmpty(param.getStaNo())) {
return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getBindingTags())) {
return R.error("鍒嗘嫞缁戝畾绫诲埆[bindingTags]涓嶈兘涓虹┖");
}
- openService.taskArmReport(param);
+ try{
+ openService.taskArmReport(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok();
}
@@ -402,9 +409,9 @@
/**
- * 鍒嗘嫞绾夸笂鎶ユ帴鏀�
+ * AGV涓婃姤鎺ユ敹
*/
- @PostMapping("/agv/task/v1")
+ @PostMapping("/agv/task/v1/agvCallback")
@AppAuth(memo = "AGV涓婃姤鎺ユ敹")
public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
@RequestBody TaskAgvReportParam param,
--
Gitblit v1.9.1