From a811a95b1f30abb8c49bfe379642666d2b956f22 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 09 七月 2025 16:48:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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..1442b28 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -7,11 +7,9 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
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;
@@ -39,16 +37,18 @@
@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
@@ -57,9 +57,10 @@
if (null == docType) {
return SUCCESS;
}
- List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("orderNo", order.getOrderNo()));
+ //List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
// 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1) {
+ if (docType.getPakin() == 1 && !Cools.isEmpty(orderDetls)) {
MesPakinParam pakinParam = new MesPakinParam();
pakinParam.setReceiptNumber(order.getOrderNo());
pakinParam.setReceiptType(order.getDocType$());
@@ -68,7 +69,7 @@
MesPakinParam.Detl detl = new MesPakinParam.Detl();
detl.setQty(orderDetl.getAnfme());
detl.setBarcode(orderDetl.getThreeCode());
- detl.setPalletBarcode(orderDetl.getBarcode());
+ detl.setPalletBarcode(orderDetl.getZpallet());
detl.setProductionCode(orderDetl.getMatnr());
pakinParam.getBarcodeList().add(detl);
}
@@ -106,7 +107,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- url +pakin,
+ url + pakin,
null,
"127.0.0.1",
JSON.toJSONString(pakinParam),
@@ -119,7 +120,7 @@
}
}
// 鍑哄簱瀹屾垚涓婃姤
-// if (docType.getPakout() == 1) {
+ if (docType.getPakout() == 1) {
// MesPakoutParam pakoutParam = new MesPakoutParam();
// pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
// pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
@@ -146,9 +147,9 @@
// 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
// } else {
// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -171,7 +172,7 @@
// );
// } catch (Exception e) { log.error("", e); }
// }
-// }
+ }
return SUCCESS;
}
--
Gitblit v1.9.1