From 49c0ee7ab5868d64ccb9a6314485bd7e06dc1ead Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 09:00:51 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/controller/OpenController.java | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 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 85fe6ad..0225ee2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,21 +1,25 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.Task;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.TaskService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -33,6 +37,58 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private TaskService taskService;
+
+
+
+ @PostMapping("/agvPickupComplete/agvCallback")
+ @AppAuth(memo = "AGV鍙栬揣瀹屾垚鎺ュ彛")
+ public Map<String, Object> agvPickupComplete(@RequestBody AgvTaskParam agvTaskParam, HttpServletRequest request) {
+ // DecimalFormat df = new DecimalFormat("0000");
+ // String wrkNo = "Ctu"+df.format(param.getWrkNo())+date.getTime()/1000;
+ String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ if (Cools.isEmpty(task)) {
+ log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
+ }
+ task.setWrkSts(0L);
+ taskService.updateById(task);
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("code","0");
+ map.put("message","鎴愬姛");
+ map.put("reqCode", "");
+ log.info("agv璇锋眰鍙栬揣瀹屾垚锛寃ms浠诲姟鍙�:"+ JSON.toJSONString(agvTaskParam));
+ return map;
+
+ }
+
+ @PostMapping("/agvTaskComplete/agvCallback")
+ @AppAuth(memo = "AGV鏀捐揣瀹屾垚鎺ュ彛")
+ public Map<String, Object> agvTaskComplete(@RequestBody AgvTaskParam agvTaskParam,HttpServletRequest request) {
+ HashMap<String, Object> map = new HashMap<>();
+ String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ if (Cools.isEmpty(task)) {
+ log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
+ }
+
+ taskService.updateById(task);
+ if (task.getIoType() < 100 ){
+ task.setWrkSts(4L);
+ }else {
+ task.setWrkSts(14L);
+ }
+
+ taskService.updateById(task);
+
+ map.put("code","0");
+ map.put("message","鎴愬姛");
+ map.put("reqCode", "");
+ return map;
+ }
+
@PostMapping("/order/matSync/default/v2")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
--
Gitblit v1.9.1