From 50e5164f1dc957eba4494bda01171afdc86d5782 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 10 七月 2024 08:27:06 +0800
Subject: [PATCH] 入库托盘有任务则写组托信号
---
src/main/java/com/zy/asrs/controller/OpenController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 48c4154..9bd9f4a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,7 +1,6 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
@@ -14,7 +13,6 @@
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.service.*;
-import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
@@ -28,6 +26,8 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -239,7 +239,7 @@
,R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
,true
);
- return R.error("绔欑偣鐘舵�佷笉鍙叆");
+ return R.error("绔欑偣鐘舵�佷笉鍙叆,鑷姩淇″彿:"+basDevp.getAutoing()+";鍙叆淇″彿:"+basDevp.getInEnable()+";鍙嚭淇″彿:"+basDevp.getOutEnable());
}
@@ -254,6 +254,7 @@
public R outboundTaskSend(@RequestHeader String appkey,
@RequestBody List<WMSAndAGVInterfaceParam> params,
HttpServletRequest request) {
+ log.warn("鏀跺埌涓嬪彂浠诲姟鏃堕棿锛歿}", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
auth(appkey, params, request);
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (WMSAndAGVInterfaceParam param:params){
@@ -317,7 +318,7 @@
}
-
+ log.warn("涓嬪彂浠诲姟瑙ｆ瀽瀹屾垚鏃堕棿锛歿}", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
return R.ok();
}
--
Gitblit v1.9.1