From e2ae6b57bb1398391be2050e85a729a7c8682f1f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 七月 2023 11:27:40 +0800
Subject: [PATCH] agv 根据调试完善MES相关接口功能
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 273 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 245 insertions(+), 28 deletions(-)
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 8dd523a..68e76cd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,25 +2,31 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.core.common.DateUtils;
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.common.constant.MesConstant;
-import com.zy.common.model.MesPakinParam;
+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.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/7/7
@@ -35,43 +41,254 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private DocTypeService docTypeService;
+
+ @Value("${mes.pakin-sync.uri}")
+ private String pakinUri;
+
+ @Value("${mes.pakin-sync.path}")
+ private String pakinPath;
+
+ @Value("${mes.pakout-sync.uri}")
+ private String pakoutUri;
+
+ @Value("${mes.pakout-sync.path}")
+ private String pakoutPath;
@Transactional
public ReturnT<String> start(Order order) {
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-
- MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
- pakinParam.setLgortFrom("5008");
- pakinParam.setLgortTo("5006");
- for (OrderDetl orderDetl : orderDetls) {
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr(), orderDetl.getAnfme()));
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
}
-
- try {
- String response = new HttpHandler.Builder()
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ // 鍏ュ簱瀹屾垚涓婃姤
+ if (docType.getPakin() == 1) {
+ /*
+ MesPakinParam pakinParam = new MesPakinParam();
+ pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
+ pakinParam.setLgortFrom("5008");
+ pakinParam.setLgortTo("5006");
+ for (OrderDetl orderDetl : orderDetls) {
+ String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
+ pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+ }
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
.setPath(MesConstant.PAKIN_URL)
.setJson(JSON.toJSONString(pakinParam))
.build()
.doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎴愬搧搴撳叆搴撲笂鎶�",
+ MesConstant.URL + MesConstant.PAKIN_URL,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(pakinParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ } */
+
+ return orderPakinSync(order,docType.getDocName(),orderDetls);
+ }
+ // 鍑哄簱瀹屾垚涓婃姤
+ if (docType.getPakout() == 1) {
+ /*
+ MesPakoutParam pakoutParam = new MesPakoutParam();
+ pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
+ pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
+ pakoutParam.setLgortFrom("5006");
+ pakoutParam.setLgortTo("1111");
+ if (!pakoutParam.isTag()) {
+ pakoutParam.setKunnr("C1000");
}
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
+ pakoutParam.setOrderNo(order.getOrderNo());
+ for (OrderDetl orderDetl : orderDetls) {
+ String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
+ pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+ }
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(MesConstant.PAKOUT_URL)
+ .setJson(JSON.toJSONString(pakoutParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎴愬搧搴撳嚭搴撲笂鎶�",
+ MesConstant.URL + MesConstant.PAKOUT_URL,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(pakoutParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
+ */
+
+ return orderPakoutSync(order,docType.getDocName(),orderDetls);
}
return SUCCESS;
}
+ private ReturnT<String> orderPakoutSync (Order order, String orderType, List<OrderDetl> orderDetls){
+ Map<String,Object> requestMap = getRequestMap(order,orderType,orderDetls);
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(pakoutUri)
+ .setPath(pakoutPath)
+ .setParams(MesSyncUtil.getRequestParamMap())
+ .setJson(JSON.toJSONString(requestMap))
+ .build()
+ .doPostWithParam();
+ success = orderSettleUpdate(response,order);
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎴愬搧搴撳嚭搴撲笂鎶�",
+ pakoutUri + pakoutPath,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(requestMap),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
+
+ return SUCCESS;
+ }
+
+ private ReturnT<String> orderPakinSync (Order order, String orderType, List<OrderDetl> orderDetls){
+ Map<String,Object> requestMap = getRequestMap(order,orderType,orderDetls);
+ System.out.println("requestMap: " + requestMap);
+
+ String response = "";
+ boolean success = false;
+
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(pakinUri)
+ .setPath(pakinPath)
+ .setParams(MesSyncUtil.getRequestParamMap())
+ .setJson(JSON.toJSONString(requestMap))
+ .build()
+ .doPostWithParam();
+ System.out.println(response);
+ success = orderSettleUpdate(response,order);
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎴愬搧搴撳叆搴撲笂鎶�",
+ pakinUri + pakinPath,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(requestMap),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
+
+ return SUCCESS;
+
+ }
+
+ private Map<String,Object> getRequestMap(Order order,String orderType, List<OrderDetl> orderDetls){
+ Map<String,Object> requestMap = new HashMap<>();
+ 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();
+ diaphragmInfo.setBatchNo(od.getBatch());
+ diaphragmInfo.setItemCode(od.getMatnr());
+ diaphragmInfo.setBarCode(od.getQrCode());
+ diaphragmInfo.setQuantity(new BigDecimal(od.getAnfme()));
+ diaphragmInfo.setAssQuantity(new BigDecimal(od.getQty()));
+ return diaphragmInfo;
+ }).collect(Collectors.toList());
+
+ requestMap.put("orderDetails",diaphragmInfoList);
+
+ return requestMap;
+ }
+
+ private boolean orderSettleUpdate(String response, Order order){
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ //success = true;
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ //log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(requestMap), response);
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ }
+
+ return true;
+ }
+
}
--
Gitblit v1.9.1