From 3c4dca5268cc4d1aed38c8b7235e4b1a163b7153 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 22:16:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 9008f74..dcb5a32 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
@@ -19,7 +20,6 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.List;
@@ -48,7 +48,8 @@
pakinParam.setLgortFrom("5008");
pakinParam.setLgortTo("5006");
for (OrderDetl orderDetl : orderDetls) {
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + "-" + orderDetl.getBatch(), orderDetl.getAnfme()));
+ String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
+ pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
}
String response = "";
boolean success = false;
@@ -72,7 +73,7 @@
}
} catch (Exception e) {
log.error("fail", e);
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
try {
--
Gitblit v1.9.1