From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 c9543c7..eaa18fb 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -57,7 +57,7 @@
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
- throw new CoolException(inHedTB.getBillNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ throw new CoolException(inHedTB.getBillNo() + "姝ｅ湪鍏ュ簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
orderService.remove(order.getId());
}
@@ -125,7 +125,7 @@
orderDetl.setWareName(outDetTB.getWareName());
orderDetl.setBatch(outDetTB.getItemBatch());
orderDetl.setAnfme(outDetTB.getMainNum());
- orderDetl.setINO(outDetTB.getINO());
+ orderDetl.setINo(outDetTB.getINO());
orderDetl.setOrderId(order.getId());
orderDetl.setTemp1(outDetTB.getTemp1());
orderDetl.setTemp2(outDetTB.getTemp2());
@@ -139,9 +139,11 @@
orderDetl.setStatus(1);
orderDetl.setProType(outDetTB.getProtype());
orderDetl.setQty(0.0D);
+ orderDetl.setSPgNO(outDetTB.getSPgNO());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
+ log.info("鍏ュ簱鍗曟嵁鎴愬姛璇︽儏,{}", orderDetl);
}
return true;
}
@@ -225,7 +227,7 @@
orderDetl.setWareName(outDetTB.getWareName());
orderDetl.setBatch(outDetTB.getItemBatch());
orderDetl.setAnfme(outDetTB.getMainNum());
- orderDetl.setINO(outDetTB.getINO());
+ orderDetl.setINo(outDetTB.getINO());
orderDetl.setOrderId(order.getId());
orderDetl.setTemp1(outDetTB.getTemp1());
orderDetl.setTemp2(outDetTB.getTemp2());
@@ -239,9 +241,11 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
orderDetl.setProType(outDetTB.getProType());
+ orderDetl.setSPgNO(outDetTB.getSPgNO());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
+ log.info("鍑哄簱鍗曟嵁鎴愬姛璇︽儏,{}", orderDetl);
}
return true;
}
--
Gitblit v1.9.1