From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 132 ++------------------------------------------
1 files changed, 6 insertions(+), 126 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 ade0620..37bdcda 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -8,13 +8,9 @@
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetlReport;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlReportService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.third.TokenUtils;
import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -39,139 +35,23 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private OrderDetlReportService orderDetlReportService;
@Autowired
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
- @Value("mes.url")
+ @Value("${mes.url}")
private String url;
- @Value("mes.pakin")
+ @Value("${mes.pakin}")
private String pakin;
@Transactional
public ReturnT<String> start(Order order) {
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("orderNo", order.getOrderNo()));
- // 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1) {
- MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setReceiptNumber(order.getOrderNo());
- pakinParam.setReceiptType(order.getDocType$());
- pakinParam.setCompleteInd("1");
- for (OrderDetlReport orderDetl : orderDetls) {
- MesPakinParam.Detl detl = new MesPakinParam.Detl();
- detl.setQty(orderDetl.getAnfme());
- detl.setBarcode(orderDetl.getThreeCode());
- detl.setPalletBarcode(orderDetl.getBarcode());
- detl.setProductionCode(orderDetl.getMatnr());
- pakinParam.getBarcodeList().add(detl);
- }
- Map<String, Object> token = TokenUtils.getToken(url);
- if (Cools.isEmpty(token)) {
- return FAIL.setMsg("鑾峰彇token澶辫触");
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(token)
- .setUri(url)
- .setPath(pakin)
- .setJson(JSON.toJSONString(pakinParam))
- .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锛歿}", url + pakin, 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(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- url +pakin,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakinParam),
- response,
- success
- );
- } catch (Exception e) {
- log.error("", e);
- }
- }
- }
- // 鍑哄簱瀹屾垚涓婃姤
-// 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");
-// }
-// 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 SUCCESS;
}
--
Gitblit v1.9.1