From ffe47d904591be8cae513a75ac899dbf720a6e71 Mon Sep 17 00:00:00 2001
From: zwl <zwl123>
Date: 星期六, 07 十月 2023 15:25:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 138 ---------------------------------------------
1 files changed, 1 insertions(+), 137 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 e79b79a..43b50b1 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -5,8 +5,6 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.sun.org.apache.xpath.internal.operations.Or;
-import com.zy.asrs.entity.DiaphragmInfo;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
@@ -21,19 +19,12 @@
import com.zy.common.model.MesPakoutParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
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 java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* Created by vincent on 2020/7/7
@@ -53,18 +44,6 @@
@Autowired
private DocTypeService docTypeService;
- @Value("${mes.pakin-sync.url}")
- private String pakinUrl;
-
- @Value("${mes.pakin-sync.path}")
- private String pakinPath;
-
- @Value("${mes.pakout-sync.url}")
- private String pakoutUrl;
-
- @Value("${mes.pakout-sync.path}")
- private String pakoutPath;
-
@Transactional
public ReturnT<String> start(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
@@ -74,7 +53,6 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 鍏ュ簱瀹屾垚涓婃姤
if (docType.getPakin() == 1) {
- /*
MesPakinParam pakinParam = new MesPakinParam();
pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
pakinParam.setLgortFrom("5008");
@@ -120,13 +98,10 @@
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()));
@@ -178,119 +153,8 @@
);
} 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(pakoutUrl)
- .setPath(pakoutPath)
- .setJson(JSON.toJSONString(requestMap))
- .build()
- .doPost();
- success = orderSettleUpdate(response,order);
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳嚭搴撲笂鎶�",
- pakoutUrl + 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);
-
- String response = "";
- boolean success = false;
-
- try {
- response = new HttpHandler.Builder()
- .setUri(pakinUrl)
- .setPath(pakinPath)
- .setJson(JSON.toJSONString(requestMap))
- .build()
- .doPost();
- success = orderSettleUpdate(response,order);
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- pakinUrl + 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);
-
- 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