From caa7a2327123cc070ae16ad802983c04e296ff11 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 04 二月 2026 13:46:00 +0800
Subject: [PATCH] #1。档案同步2，任务状态上报，3设备状态读取，4心跳，5wms手动完成取消任务
---
src/main/java/com/zy/asrs/controller/OpenController.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cff1c14..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 = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -413,9 +424,12 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("WMS浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ 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]涓嶈兘涓虹┖");
// }
@@ -426,4 +440,30 @@
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