From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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..5f7cece 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),
--
Gitblit v1.9.1