From e596214d84efa77d0cf316563548f1b1d7643a37 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 08:40:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 95 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1c26f05..dde394f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -223,6 +224,7 @@
* 鍒嗘嫞绾夸笂鎶ユ帴鏀�
*/
@PostMapping("/arm/task/v1")
+ @AppAuth(memo = "鍒嗘嫞绾夸笂鎶ユ帴鏀�")
public synchronized R TaskArmReport(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmReportParam param,
HttpServletRequest request) {
@@ -242,13 +244,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]涓嶈兘涓虹┖");
}
- openService.taskArmReport(param);
+ if (Cools.isEmpty(param.getBindingTags())) {
+ return R.error("鍒嗘嫞缁戝畾绫诲埆[bindingTags]涓嶈兘涓虹┖");
+ }
+ try{
+ openService.taskArmReport(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok();
}
@@ -257,6 +269,7 @@
* 鍗曠爜瀹屾垚
*/
@PostMapping("/arm/task/cycle_result")
+ @AppAuth(memo = "鍗曠爜瀹屾垚")
public synchronized R TaskArmCycleResult(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmCycleResultParam param,
HttpServletRequest request) {
@@ -288,6 +301,7 @@
* 鎵樼洏瀹屾垚
*/
@PostMapping("/arm/task/workspace_status")
+ @AppAuth(memo = "鎵樼洏瀹屾垚")
public synchronized R TaskArmWorkspaceStatus(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmWorkspaceStatusParam param,
HttpServletRequest request) {
@@ -300,6 +314,9 @@
}
if (Cools.isEmpty(param.getId())) {
return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+ }
+ if (Integer.parseInt(param.getId())<2){
+ return R.ok().add("鏉ユ枡鍙ｇ┖闂村浣嶆垚鍔�");
}
if (Cools.isEmpty(param.getType())) {
return R.error("瀹汉鍨嬪彿[pick_num]涓嶈兘涓虹┖");
@@ -317,6 +334,7 @@
* 寮傚父涓婃姤
*/
@PostMapping("/armAbnormalOperation")
+ @AppAuth(memo = "寮傚父涓婃姤")
public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmErrorParam param,
HttpServletRequest request) {
@@ -336,6 +354,7 @@
* 璁㈠崟瀹屾垚涓婃姤
*/
@PostMapping("/arm/task/order_result")
+ @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
@RequestBody OrderArmEndParam param,
HttpServletRequest request) {
@@ -359,4 +378,77 @@
return R.ok();
}
+
+
+ /**
+ * 鏄惁瀛樺湪鍚庣画鎵樼洏
+ */
+ @PostMapping("/arm/task/order_sign")
+ @AppAuth(memo = "鏄惁瀛樺湪鍚庣画鎵樼洏")
+ public synchronized R TaskArmWorkOrderSign(@RequestHeader(required = false) String appkey,
+ @RequestBody OrderArmEndParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrder_id())) {
+ return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+ }
+ try{
+ param.OrderIdTwo(sign_arm_order,sign_arm_sku);
+ } catch (Exception e){
+ return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ }
+
+ boolean taskArmWorkOrderSign = openService.TaskArmWorkOrderSign(param);
+ return R.ok().add(taskArmWorkOrderSign);
+ }
+
+
+ /**
+ * AGV涓婃姤鎺ユ敹
+ */
+ @PostMapping("/agv/task/v1/agvCallback")
+ @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
+ public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskAgvReportParam param,
+ HttpServletRequest request) {
+// auth(appkey, param, request);
+ // 鏃ュ織璁板綍
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ apiLogService.save(
+ "AGV涓婃姤鎺ユ敹",
+ "/open/asrs/agv/task/v1/agvCallback",
+ null,
+ request.getRemoteAddr(),
+ JSON.toJSONString(param),
+ null,
+ true
+ );
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getReqCode())) {
+ return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getTaskCode())) {
+ return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
+ }
+ String taskCode = param.getTaskCode();
+ String[] split = taskCode.split("-");
+ param.setTaskNo(Integer.parseInt(split[0]));
+// if (Cools.isEmpty(param.getTimestamp())) {
+// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
+// }
+ boolean taskAgvReport = openService.TaskAgvReport(param);
+ if (taskAgvReport){
+ return R.ok();
+ }
+ return R.error("浠诲姟鍙蜂笉瀛樺湪");
+ }
+
}
--
Gitblit v1.9.1