From 70f6e26f42bce8feb887a55ab8e95fb92c175369 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 17 六月 2023 09:19:50 +0800
Subject: [PATCH] 孚能
---
src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java | 19 ++++++++-----------
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 1 +
src/main/webapp/views/pakStore/locDetlQuery.html | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 3 +--
src/main/resources/application.yml | 2 +-
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 4 ++--
6 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
index 30a725f..1bea28a 100644
--- a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
@@ -1,7 +1,6 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.core.common.SnowflakeIdWorker;
import com.zy.asrs.entity.ApiLog;
import com.zy.asrs.mapper.ApiLogMapper;
import com.zy.asrs.service.ApiLogService;
@@ -10,36 +9,34 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
import java.util.Date;
@Slf4j
@Service("apiLogService")
public class ApiLogServiceImpl extends ServiceImpl<ApiLogMapper, ApiLog> implements ApiLogService {
-
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
-
@Async
@Override
public void save(String namespace, String url, String appkey, String ip, String request, String response, boolean success) {
Date now = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
ApiLog apiLog = new ApiLog(
- String.valueOf(snowflakeIdWorker.nextId()), // 鏃ュ織缂栧彿
+ dateFormat.format(now), // 鏃ュ織缂栧彿
namespace, // 鍚嶇О绌洪棿
url, // 鎺ュ彛鍦板潃
- appkey, // 骞冲彴瀵嗛挜
+ "110", // 骞冲彴瀵嗛挜
String.valueOf(now.getTime()), // 鏃堕棿鎴�
ip, // 瀹㈡埛绔疘P
request, // 璇锋眰鍐呭
response,
- null, // 寮傚父鍐呭
+ "0", // 寮傚父鍐呭
success?1:0 , // 缁撴灉
1, // 鐘舵��
now, // 娣诲姞鏃堕棿
- null, // 淇敼鏃堕棿
- null // 澶囨敞
+ now, // 淇敼鏃堕棿
+ "null" // 澶囨敞
);
- if (!this.insert(apiLog)) {
+ if (this.baseMapper.insert(apiLog) < 0) {
log.error("鎺ュ彛璋冪敤鏃ュ織淇濆瓨澶辫触锛�");
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 17691fb..5177283 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -365,6 +365,7 @@
testMast.setChannel(locMast.getChannel());
testMast.setLocNo(wrkMast.getLocNo());
testMast.setModiTime(new Date());
+ testMast.setBarcode(locDetl.getMatnr());
if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
.eq("loc_no",sourceLoc.getLocNo())
.eq("user_id",locMast.getBarcode())
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index ccf5b5d..c1ee96d 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.impl.ApiLogServiceImpl;
@@ -14,8 +15,6 @@
@Slf4j
public class PostMesDataUtils extends AbstractHandler<String> {
-
- private ApiLogService apiLogService = new ApiLogServiceImpl();
public ReturnT<String> postMesData(String name,String URL,String mesPath, Object combParam){
// if (true){
@@ -51,6 +50,7 @@
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
apiLogService.save(
"涓婃姤"+name,
URL +"/"+ mesPath,
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 683c4b3..55d8621 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -175,7 +175,7 @@
}
/**
- * 鍏ㄦ澘鍏ュ簱
+ * 鍏ㄦ澘鍏ュ簱
*/
@Transactional
public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
@@ -249,7 +249,6 @@
}
}else if(wrkMast.getStaNo()==209){
testMast.setBarcode(wrkDetl.getMatnr());
- testMast.setChannel(locMast.getChannel());
testMast.setLocNo(locMast.getLocNo());
testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
testMast.setAppeTime(now);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fca00ef..71f50fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -66,7 +66,7 @@
# 鍏呮斁鐢垫祴璇曢�氶亾
channel:
# 鏈�澶ч�氶亾鏁�
- channelMax: 24
+ channelMax: 48
# 鍏呮斁鐢垫祴璇曟煖鏁伴噺
equipmentCount: 6
# 娴嬭瘯搴撲綅鎵�鍦ㄦ帓鍙�
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 35b9f09..4777250 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -64,7 +64,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="PACK鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1