From 548d32793451d756dad9412d285dd22e2fe64afd Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 12:36:34 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 8c3a2be..2d41bc7 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -51,11 +51,6 @@
@Autowired
private AgvLocMastService agvLocMastService;
-
- @Autowired
- private AgvWrkMastService agvWrkMastService;
-
-
@Value("${spring.profiles.active}")
private String active;
@@ -67,6 +62,7 @@
@Value("${u8.orderReportPath}")
private String orderReportPath;
+
@Transactional
public ReturnT<String> start(Order order) {
@@ -128,7 +124,6 @@
}
}
}
-
if (Cools.isEmpty(order.getPltType())) {
return;
}
@@ -186,7 +181,7 @@
childInfo.setIrowno(orderDetl.getItemNum());
childInfo.setCInvCode(orderDetl.getMatnr());
childInfo.setIQuantity(orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()) + "");
- String batch = orderDetl.getBrand();
+ String batch = orderDetl.getBatch();
if (Cools.isEmpty(batch)) {
childInfo.setCBatch("");
childInfo.setBFree1("");
--
Gitblit v1.9.1