From 2a534b8afd115ec4a566be611a4be7f543c9a3af Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 16 十二月 2024 16:23:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 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 a94b4bd..400eea6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -14,8 +14,10 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.MesPakinParam;
+import com.zy.common.model.MesPakoutParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +51,8 @@
if (null == docType) {
return SUCCESS;
}
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
// 鍏ュ簱瀹屾垚涓婃姤
if (docType.getPakin() == 1) {
MesPakinParam pakinParam = new MesPakinParam();
@@ -73,9 +76,10 @@
if (jsonObject.getInteger("code").equals(200)) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -101,7 +105,58 @@
}
// 鍑哄簱瀹屾垚涓婃姤
if (docType.getPakout() == 1) {
- // todo
+ 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ } 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