From 65c305f9e8af6fdb4f80b85484b1170f068aa1fa Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期三, 10 九月 2025 10:43:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index aff3acf..9cc27fa 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -51,13 +51,13 @@
/**
* @return
*/
- @Transactional(rollbackFor = Throwable.class)
+ @Transactional
public boolean createInOrder(InHedTB inHedTB, List<InDetTB> inDetTBs) {
Order order = orderService.selectByNo(inHedTB.getBillNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
- throw new CoolException(inHedTB.getBillNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ throw new CoolException(inHedTB.getBillNo() + "姝ｅ湪鍏ュ簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
orderService.remove(order.getId());
}
@@ -67,7 +67,7 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
inHedTB.getBillNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(inHedTB.getMakeDate()), // 鍗曟嵁鏃ユ湡
+ DateUtils.convert(inHedTB.getBillDate()), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
@@ -85,7 +85,7 @@
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
+ 1, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
@@ -143,6 +143,7 @@
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
+ log.info("鍏ュ簱鍗曟嵁鎴愬姛璇︽儏,{}", orderDetl);
}
return true;
}
@@ -151,7 +152,7 @@
/**
* @return
*/
- @Transactional(rollbackFor = Throwable.class)
+ @Transactional
public boolean createOutOrder(OutHedTB inHedTB, List<OutDetTB> inDetTBs) {
Order order = orderService.selectByNo(inHedTB.getBillNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
@@ -185,7 +186,7 @@
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
+ 1, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
@@ -200,6 +201,7 @@
inHedTB.getMakeDate(), // 淇敼鏃堕棿
inHedTB.getRemark() // 澶囨敞
);
+ order.setShipCode(inHedTB.getTemp4());
order.setTemp1(inHedTB.getTemp1());
order.setTemp2(inHedTB.getTemp2());
order.setTemp3(inHedTB.getTemp3());
@@ -244,6 +246,7 @@
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
+ log.info("鍑哄簱鍗曟嵁鎴愬姛璇︽儏,{}", orderDetl);
}
return true;
}
--
Gitblit v1.9.1