From 20e8b29ab26083c26b755d4c1087af2116d22262 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 七月 2023 09:55:02 +0800
Subject: [PATCH] agv 根据调试完善MES相关接口功能
---
src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java
index 7b80152..cf52e3d 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesMatSyncHandler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MaterialInfo;
import com.zy.asrs.service.ApiLogService;
@@ -18,14 +19,17 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
public class MesMatSyncHandler extends AbstractHandler<String> {
- @Value("${mes.mat-sync.url}")
- private String url;
+ @Value("${mes.mat-sync.uri}")
+ private String uri;
@Value("${mes.mat-sync.path}")
private String path;
@@ -39,8 +43,8 @@
@Transactional
public ReturnT<String> start() throws IOException {
boolean success = true;
- log.info("url:" + url + path);
- JSONObject jsonObject = doGetJsonData();
+ JSONObject jsonObject = doPostJsonData();
+ log.info("MesMatSync jsonObject: " + jsonObject.toJSONString());
int code = jsonObject.getInteger("code");
@@ -61,7 +65,7 @@
private void saveApiLog(String response, boolean success) {
apiLogService.save(
"鍟嗗搧淇℃伅鍚屾",
- url + path,
+ uri + path,
null,
"127.0.0.1",
null,
@@ -71,16 +75,24 @@
}
/*
- 鍙戣捣涓�涓猟oGet璇锋眰
+ 鍙戣捣涓�涓姹傛潵鑾峰彇鍟嗗搧淇℃伅
*/
- private JSONObject doGetJsonData() throws IOException {
+ private JSONObject doPostJsonData() throws IOException {
+
+ Map<String, Object> requestParamMap = MesSyncUtil.getRequestParamMap();
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>().orderBy("update_time", false));
+ //濡傛灉WMS涓湁mat淇℃伅锛屽垯鑾峰彇鏈�鏂扮殑mat淇敼鏃堕棿锛岀劧鍚庤幏鍙栬鏃堕棿涔嬪悗鎵�鏈夋洿鏂拌繃鐨勯殧鑶滃嵎淇℃伅銆傚鏋滄病鏈塵at淇℃伅锛屽垯鑾峰彇鎵�鏈夐殧鑶滃嵎淇℃伅
+ if(!Cools.isEmpty(mat)){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ requestParamMap.put("time",sdf.format(mat.getUpdateTime()));
+ }
return JSON.parseObject( new HttpHandler.Builder()
- .setUri(url)
+ .setUri(uri)
.setPath(path)
- .setParams(MesSyncUtil.getRequestParamMap())
+ .setParams(requestParamMap)
.build()
- .doGet());
+ .doPostWithParam());
}
/*
@@ -112,7 +124,7 @@
//
m.setCreateTime((data.getMdate()));
//淇敼鏃堕棿 -- 鏇存柊鏃堕棿
- m.setUpdateTime(data.getMdate());
+ m.setUpdateTime(new Date());
//鍟嗗搧缂栫爜 -- 鐗╂枡缂栫爜
m.setMatnr(data.getItemCode());
//鍟嗗搧鍚嶇О -- 鐗╂枡鍚嶇О
--
Gitblit v1.9.1