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 +++-
src/main/java/com/zy/common/utils/HttpHandler.java | 31 +++++
src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java | 186 ++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/MesMatSyncScheduler.java | 3
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 17 +-
src/main/java/com/zy/asrs/utils/MesSyncUtil.java | 10 +
src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java | 30 +++--
src/main/resources/application.yml | 21 +-
8 files changed, 285 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/MesMatSyncScheduler.java b/src/main/java/com/zy/asrs/task/MesMatSyncScheduler.java
index a0baa3a..1c7a76e 100644
--- a/src/main/java/com/zy/asrs/task/MesMatSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/MesMatSyncScheduler.java
@@ -19,7 +19,8 @@
@Autowired
MesMatSyncHandler handler;
- //@Scheduled(cron = "0/30 * * * * ?")
+ @Scheduled(cron = "0/30 * * * * ?")
+ //@Scheduled(cron = "0 0/2 * * * ?")
private void execute() {
ReturnT<String> result = null;
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());
//鍟嗗搧鍚嶇О -- 鐗╂枡鍚嶇О
diff --git a/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java b/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
index 2e819a7..e8465b3 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesPakinHandler.java
@@ -27,12 +27,13 @@
import java.io.IOException;
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
public class MesPakinHandler extends AbstractHandler<String> {
- @Value("${mes.pakin.url}")
- private String url;
+ @Value("${mes.pakin.uri}")
+ private String uri;
@Value("${mes.pakin.path}")
private String path;
@@ -55,10 +56,10 @@
@Transactional
public ReturnT<String> start() {
boolean success = true;
- log.info("url:" + url + path);
+ log.info("url:" + uri + path);
JSONObject jsonObject = null;
try {
- jsonObject = doGetJsonData();
+ jsonObject = doPostJsonData();
} catch (IOException e) {
success = false;
e.printStackTrace();
@@ -86,7 +87,7 @@
private void saveApiLog(String response, boolean success){
apiLogService.save(
"鐢熸垚鍏ュ簱鍗曟嵁",
- url + path,
+ uri + path,
null,
"127.0.0.1",
null,
@@ -96,15 +97,20 @@
}
/*
- 鍙戣捣涓�涓猟oGet璇锋眰
+ 鍙戣捣涓�涓姹傛潵鑾峰彇鏈幏鍙栬繃鐨勫崟鎹俊鎭�
*/
- private JSONObject doGetJsonData() throws IOException {
+ private JSONObject doPostJsonData() throws IOException {
+
+ Map<String, Object> requestParamMap = MesSyncUtil.getRequestParamMap();
+ //鑾峰彇鏈幏鍙栬繃鐨勬墍鏈夊崟鎹�
+ requestParamMap.put("type",0);
+
return JSON.parseObject( new HttpHandler.Builder()
- .setUri(url)
+ .setUri(uri)
.setPath(path)
- .setParams(MesSyncUtil.getRequestParamMap())
+ .setParams(requestParamMap)
.build()
- .doGet());
+ .doPostWithParam());
}
/*
@@ -164,8 +170,8 @@
o.setOrderTime(jsonData.getString("orderTime"));
//鍗曟嵁绫诲瀷
DocType docType = docTypeService.selectOrAdd(jsonData.getString("orderType"), Boolean.TRUE);
- //鍏ュ簱搴撴埧鍚嶇О(绔嬩綋搴撳悕绉�)
- jsonData.getString("storage");
+ //鐗╂祦鍚嶇О -- 鍏ュ簱搴撴埧鍚嶇О(绔嬩綋搴撳悕绉�)
+ o.setShipName(jsonData.getString("storage"));
o.setDocType(docType.getDocId());
o.setCreateTime(new Date());
o.setUpdateTime(new Date());
diff --git a/src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java b/src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java
index 96b0484..24bb061 100644
--- a/src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MesPakoutHandler.java
@@ -1,37 +1,215 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SnowflakeIdWorker;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.DiaphragmInfo;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MesSyncUtil;
+import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
@Slf4j
@Service
public class MesPakoutHandler extends AbstractHandler<String> {
- @Value("${mes.pakin.url}")
- private String url;
+ @Value("${mes.pakout.uri}")
+ private String uri;
- @Value("${mes.pakin.path}")
+ @Value("${mes.pakout.path}")
private String path;
@Autowired
private DocTypeService docTypeService;
@Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Autowired
private OrderService orderService;
+
+ @Autowired
+ private ApiLogService apiLogService;
@Autowired
private OrderDetlService orderDetlService;
- public ReturnT<String> start() throws IOException {
+ @Transactional
+ public ReturnT<String> start() {
+ boolean success = true;
+ log.info("url:" + uri + path);
+ JSONObject jsonObject = null;
+ try {
+ jsonObject = doPostJsonData();
+ } catch (IOException e) {
+ success = false;
+ e.printStackTrace();
+ }
+ int code = jsonObject.getInteger("code");
+
+ if(code == 200){
+ JSONObject jsonData = jsonObject.getJSONObject("data");
+ String orderNo = jsonData.getString("orderNo");
+ Order o = insertOrder(jsonData,orderNo);
+ insertOrUpdateOrderDetl(jsonData, o);
+
+ }else {
+ success = false;
+ log.error("璇锋眰mes鎺ュ彛鍝嶅簲閿欒锛屽搷搴旂爜涓�: " + code);
+ }
+ saveApiLog(jsonObject.toJSONString(),success);
return SUCCESS;
}
+
+ /*
+ 淇濆瓨鏃ュ織
+ */
+ private void saveApiLog(String response, boolean success){
+ apiLogService.save(
+ "鐢熸垚鍏ュ簱鍗曟嵁",
+ uri + path,
+ null,
+ "127.0.0.1",
+ null,
+ response,
+ success
+ );
+ }
+
+ /*
+ 鍙戣捣涓�涓姹傛潵鑾峰彇鏈幏鍙栬繃鐨勫崟鎹俊鎭�
+ */
+ private JSONObject doPostJsonData() throws IOException {
+
+ Map<String, Object> requestParamMap = MesSyncUtil.getRequestParamMap();
+ //鑾峰彇鏈幏鍙栬繃鐨勬墍鏈夊崟鎹�
+ requestParamMap.put("type",0);
+
+ return JSON.parseObject( new HttpHandler.Builder()
+ .setUri(uri)
+ .setPath(path)
+ .setParams(requestParamMap)
+ .build()
+ .doPostWithParam());
+ }
+
+ /*
+ 鏂板order淇℃伅
+ */
+ private Order insertOrder(JSONObject jsonData, String orderNo){
+ Order o = orderService.selectByNo(orderNo);
+ if (!Cools.isEmpty(o)) {
+ throw new CoolException(jsonData.getString("orderNo") + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+
+ o = orderMapping(jsonData);
+ if (!orderService.insert(o)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ return o;
+ }
+
+ /*
+ 鏍规嵁orderNo銆乵atnr銆乥atch锛屾柊澧炴垨鑰呮洿鏀筼rderDetl淇℃伅
+ */
+ private void insertOrUpdateOrderDetl(JSONObject jsonData, Order o){
+ List<DiaphragmInfo> diaphragmInfoList = JSONObject.parseArray(jsonData.getString("orderDetails"),DiaphragmInfo.class);
+
+ diaphragmInfoList.forEach(d -> {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("order_no",o.getOrderNo()).eq("matnr",d.getItemCode()).eq("batch",d.getBatchNo());
+ OrderDetl od = orderDetlService.selectOne(wrapper);
+ if(od == null){
+ od = new OrderDetl();
+ od.setOrderNo(o.getOrderNo());
+ od.setOrderId(o.getId());
+ orderDetlMapping(d,od);
+ orderDetlService.insert(od);
+ }else {
+ od.setQty(od.getQty() + d.getQuantity().doubleValue());
+ od.setAnfme(od.getAnfme() + d.getAssQuantity().doubleValue());
+ od.setUpdateTime(new Date());
+ orderDetlService.updateById(od);
+ }
+ });
+ }
+
+ /*
+ 鏄犲皠Order绫诲拰jsonData鐨勫瓧娈�
+ */
+ private Order orderMapping(JSONObject jsonData){
+ Order o = new Order();
+ o.setStatus(1);
+ //璁剧疆璁㈠崟鐘舵�� --- 鍒濆鍖栫姸鎬�
+ o.setSettle(0L);
+ //uuid
+ o.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ //鍗曟嵁缂栧彿
+ o.setOrderNo(jsonData.getString("orderNo"));
+ //鍗曟嵁鏃堕棿
+ o.setOrderTime(jsonData.getString("orderTime"));
+ //鍗曟嵁绫诲瀷
+ DocType docType = docTypeService.selectOrAdd(jsonData.getString("orderType"), Boolean.TRUE);
+ //鐗╂祦鍚嶇О -- 鍏ュ簱搴撴埧鍚嶇О(绔嬩綋搴撳悕绉�)
+ o.setShipName(jsonData.getString("storage"));
+ o.setDocType(docType.getDocId());
+ o.setCreateTime(new Date());
+ o.setUpdateTime(new Date());
+ return o;
+ }
+
+ /*
+ 鏄犲皠OrderDetl涓庨殧鑶滀俊鎭被鐨勫瓧娈靛叧绯�
+ */
+ private void orderDetlMapping(DiaphragmInfo d, OrderDetl od){
+ //鎵瑰彿 -- 鐢熶骇鎵瑰彿
+ od.setBatch(d.getBatchNo());
+ //鍟嗗搧缂栫爜 -- 鐗╂枡缂栫爜
+ od.setMatnr(d.getItemCode());
+ //鍟嗗搧鍚嶇О -- 鐗╂枡鍚嶇О
+ od.setMaktx(d.getItemName());
+ //鏁伴噺 -- 鏁伴噺
+ od.setAnfme(d.getQuantity() == null ? null : d.getQuantity().doubleValue());
+ //瀹屾垚鏁伴噺 -- 杈呮暟閲�
+ od.setQty(d.getAssQuantity() == null ? null : d.getAssQuantity().doubleValue());
+ //瑙勬牸 -- 瑙勬牸/鍨嬪彿
+ od.setSpecs(d.getStd());
+ //澶囨敞 -- 澶囨敞
+ od.setMemo(d.getNote());
+ //鏉″舰鐮� -- 鏉″舰鐮�
+ od.setQrCode(d.getBarCode());
+ //棰滆壊 -- 澶у嵎浣嶇疆
+ od.setColor(d.getPosition());
+ //鍨嬪彿 -- 灏忓嵎浣嶇疆
+ od.setModel(d.getPosition2());
+ //鍝佺墝 -- 绛夌骇
+ od.setBrand(d.getGrade());
+ //鏀跺嵎寮�濮嬫棩鏈�
+ od.setStartDate(d.getStartDate());
+ //鏀跺嵎缁撴潫鏃ユ湡
+ od.setEndDate(d.getEndDate());
+
+ od.setCreateTime(new Date());
+ od.setUpdateTime(new Date());
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index d521519..0f716ab 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -45,14 +45,14 @@
@Autowired
private DocTypeService docTypeService;
- @Value("${mes.pakin-sync.url}")
- private String pakinUrl;
+ @Value("${mes.pakin-sync.uri}")
+ private String pakinUri;
@Value("${mes.pakin-sync.path}")
private String pakinPath;
- @Value("${mes.pakout-sync.url}")
- private String pakoutUrl;
+ @Value("${mes.pakout-sync.uri}")
+ private String pakoutUri;
@Value("${mes.pakout-sync.path}")
private String pakoutPath;
@@ -183,7 +183,7 @@
boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri(pakoutUrl)
+ .setUri(pakoutUri)
.setPath(pakoutPath)
.setJson(JSON.toJSONString(requestMap))
.build()
@@ -198,7 +198,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳嚭搴撲笂鎶�",
- pakoutUrl + pakoutPath,
+ pakoutUri + pakoutPath,
null,
"127.0.0.1",
JSON.toJSONString(requestMap),
@@ -219,7 +219,7 @@
try {
response = new HttpHandler.Builder()
- .setUri(pakinUrl)
+ .setUri(pakinUri)
.setPath(pakinPath)
.setJson(JSON.toJSONString(requestMap))
.build()
@@ -234,7 +234,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- pakinUrl + pakinPath,
+ pakinUri + pakinPath,
null,
"127.0.0.1",
JSON.toJSONString(requestMap),
@@ -253,6 +253,7 @@
requestMap.put("orderNo",order.getOrderNo());
requestMap.put("orderTime",order.getOrderTime());
requestMap.put("orderType",orderType);
+ requestMap.put("storage",order.getShipName());
List<DiaphragmInfo> diaphragmInfoList = orderDetls.stream().map(od -> {
DiaphragmInfo diaphragmInfo = new DiaphragmInfo();
diff --git a/src/main/java/com/zy/asrs/utils/MesSyncUtil.java b/src/main/java/com/zy/asrs/utils/MesSyncUtil.java
index 5856a28..749d259 100644
--- a/src/main/java/com/zy/asrs/utils/MesSyncUtil.java
+++ b/src/main/java/com/zy/asrs/utils/MesSyncUtil.java
@@ -1,5 +1,6 @@
package com.zy.asrs.utils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.DigestUtils;
import java.nio.charset.StandardCharsets;
@@ -9,13 +10,20 @@
public class MesSyncUtil {
+ @Value("${mes.appkey}")
+ private static String appkey;
+
public static Map<String,Object> getRequestParamMap(){
Date date = new Date();
String ts = date.getTime() + "";
- String key = DigestUtils.md5DigestAsHex(("appkey" + ts).getBytes(StandardCharsets.UTF_8));
+ String key = DigestUtils.md5DigestAsHex((appkey + ts).getBytes(StandardCharsets.UTF_8));
Map<String,Object> requestParamMap = new HashMap<>();
requestParamMap.put("ts",ts);
requestParamMap.put("key",key);
return requestParamMap;
}
+
+ public static void main(String[] args) {
+ System.out.println(MesSyncUtil.getRequestParamMap());
+ }
}
diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java
index 70adcc7..5162b6e 100644
--- a/src/main/java/com/zy/common/utils/HttpHandler.java
+++ b/src/main/java/com/zy/common/utils/HttpHandler.java
@@ -56,6 +56,37 @@
}
/**
+ * POST璇锋眰鎵ц 骞朵笖url甯﹀弬鏁拌姹�
+ * @return the HttpHandler response
+ */
+ public String doPostWithParam() throws IOException {
+ Request request;
+ Request.Builder headerBuilder = new Request.Builder();
+ if (headers != null && headers.size()>0){
+ for (Map.Entry<String, Object> entry : headers.entrySet()){
+ headerBuilder.addHeader(entry.getKey(), String.valueOf(entry.getValue()));
+ }
+ }
+ if (json == null || "".equals(json)){
+ FormBody.Builder builder = new FormBody.Builder();
+ FormBody body = builder.build();
+ request = headerBuilder
+ .url(paramsToUrl(uri, path, params, https))
+ .post(body)
+ .build();
+ } else {
+ RequestBody body = RequestBody.create(MEDIA_TYPE, json);
+ Request.Builder builder = headerBuilder.url((https?"https://":"http://")+uri+path);
+ builder.header("Content-Type", "application/json;charset=UTF-8");
+ request = builder.post(body).build();
+
+ }
+ Call call = getClient(timeout, timeUnit).newCall(request);
+ Response response = call.execute();
+ return response.body().string();
+ }
+
+ /**
* POST璇锋眰鎵ц
* @return the HttpHandler response
*/
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f04e9e6..be67486 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -62,19 +62,20 @@
limit: 5000
mes:
+ appkey: SX3WMS20230725
mat-sync:
- url: localhost:8080
- path: /test/getMat
+ uri: http://fmis.huashijie.com.cn:8082
+ path: /api/SX3WMS/Material
pakin:
- url: localhost:8080
- path: /test/getOrder
+ uri: http://fmis.huashijie.com.cn:8082
+ path: /api/SX3WMS/StorageIn
pakout:
- url: localhost:8080
- path: /test/getOrder
+ uri: http://fmis.huashijie.com.cn:8082
+ path: /api/SX3WMS/StorageInCheck
pakin-sync:
- url: localhost:8080
- path: /test/syncOrderPakin
+ uri: http://fmis.huashijie.com.cn:8082
+ path: /api/SX3WMS/StorageOut
pakout-sync:
- url: localhost:8080
- path: /test/syncOrderPakout
+ uri: http://fmis.huashijie.com.cn:8082
+ path: /api/SX3WMS/StorageOutCheck
--
Gitblit v1.9.1