From b0752dae29c4eadb96480d4c884c5badb9a66fb5 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 03 三月 2026 15:48:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 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 4d96559..7277a53 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,11 +1,16 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
+import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WorkService;
+import com.zy.asrs.service.impl.WrkMastServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -16,6 +21,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
/**
* Created by vincent on 2022/4/8
@@ -34,6 +41,10 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private WrkMastServiceImpl wrkMastService;
@PostMapping("/order/matSync/default/v2")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -249,6 +260,9 @@
if (Cools.isEmpty(param.getStaNo())) {
return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param.getBindingTags())) {
+ return R.error("鍒嗘嫞缁戝畾绫诲埆[bindingTags]涓嶈兘涓虹┖");
+ }
openService.taskArmReport(param);
return R.ok();
}
@@ -303,6 +317,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]涓嶈兘涓虹┖");
@@ -370,6 +387,7 @@
* 鏄惁瀛樺湪鍚庣画鎵樼洏
*/
@PostMapping("/arm/task/order_sign")
+ @AppAuth(memo = "鏄惁瀛樺湪鍚庣画鎵樼洏")
public synchronized R TaskArmWorkOrderSign(@RequestHeader(required = false) String appkey,
@RequestBody OrderArmEndParam param,
HttpServletRequest request) {
@@ -393,4 +411,59 @@
return R.ok().add(taskArmWorkOrderSign);
}
+
+ /**
+ * 鍒嗘嫞绾夸笂鎶ユ帴鏀�
+ */
+ @PostMapping("/agv/task/v1")
+ @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
+ public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskAgvReportParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getReqCode())) {
+ return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
+ }
+ String reqCode = param.getReqCode();
+ String[] split = reqCode.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("浠诲姟鍙蜂笉瀛樺湪");
+ }
+
+ /**
+ * 蹇冭烦鎺ュ彛
+ */
+ @PostMapping("/wmsHeartbeat")
+ public R heartbeat(@RequestBody Map<String, Object> param) {
+ if (param != null && param.get("timeStamp") != null) {
+ return R.ok("鎿嶄綔鎴愬姛");
+ }
+ return R.error("澶辫触");
+ }
+
+ @RequestMapping("/taskCancel")
+ @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
+ public R handControlWrkMast(@RequestHeader(required = false) String appkey,@RequestBody TaskCancelParam taskCancelParam,HttpServletRequest request){
+ auth(appkey, taskCancelParam, request);
+
+ if (taskCancelParam.getTaskStatus() == 2) {
+ workService.completeWrkMast(taskCancelParam.getTaskNo(),null);
+ return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
+ } else if (taskCancelParam.getTaskStatus() == 1) {
+ workService.cancelWrkMast(taskCancelParam.getTaskNo(), null);
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1