From d8c9b9afb41c368a08d7e05d0f624c98bf72042a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 06 六月 2025 11:18:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 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 6904b70..a7c0421 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -51,17 +51,17 @@
/**
* @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());
}
- DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+ DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindName(), inHedTB.getIoKindID(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
@@ -100,11 +100,16 @@
inHedTB.getMakeDate(), // 淇敼鏃堕棿
inHedTB.getRemark() // 澶囨敞
);
+ order.setTemp1(inHedTB.getTemp1());
+ order.setTemp2(inHedTB.getTemp2());
+ order.setTemp3(inHedTB.getTemp3());
+ order.setWareId(inHedTB.getWareId());
+ order.setWareName(inHedTB.getWareName());
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
for (InDetTB outDetTB : inDetTBs) {
- Mat mat = matService.selectByMatnr(outDetTB.getItemCode());
+ Mat mat = matService.selectByMatnr(outDetTB.getItemId());
if (Cools.isEmpty(mat)) {
throw new CoolException(outDetTB.getItemCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
@@ -113,14 +118,17 @@
orderDetl.setOrderNo(outDetTB.getBillNo());
orderDetl.setOutOrderNo(outDetTB.getOrderNo());
orderDetl.setAutoId(outDetTB.getAutoId());
- orderDetl.setLuHao(outDetTB.getLuHao());
- orderDetl.setSpecs(outDetTB.getSPgNO());
+ orderDetl.setDetId(outDetTB.getDetId());
+// orderDetl.setLuHao(outDetTB.getLuHao());
+// orderDetl.setSpecs(outDetTB.getSPgNO());
orderDetl.setPacking(outDetTB.getPacking());
+ orderDetl.setSuppCode(inHedTB.getObjectId());
+ orderDetl.setSupp(inHedTB.getObjectName());
orderDetl.setWareId(outDetTB.getWareId());
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());
@@ -132,10 +140,13 @@
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
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;
}
@@ -144,7 +155,7 @@
/**
* @return
*/
- @Transactional(rollbackFor = Throwable.class)
+ @Transactional
public boolean createOutOrder(OutHedTB inHedTB, List<OutDetTB> inDetTBs) {
Order order = orderService.selectByNo(inHedTB.getBillNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
@@ -154,7 +165,7 @@
}
orderService.remove(order.getId());
}
- DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+ DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindName(),inHedTB.getIoKindID(), Boolean.FALSE);
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
@@ -193,11 +204,17 @@
inHedTB.getMakeDate(), // 淇敼鏃堕棿
inHedTB.getRemark() // 澶囨敞
);
+ order.setTemp1(inHedTB.getTemp1());
+ order.setTemp2(inHedTB.getTemp2());
+ order.setTemp3(inHedTB.getTemp3());
+ order.setWareId(inHedTB.getWareId());
+ order.setWareName(inHedTB.getWareName());
+
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
for (OutDetTB outDetTB : inDetTBs) {
- Mat mat = matService.selectByMatnr(outDetTB.getItemCode());
+ Mat mat = matService.selectByMatnr(outDetTB.getItemId());
if (Cools.isEmpty(mat)) {
throw new CoolException(outDetTB.getItemCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
@@ -206,29 +223,37 @@
orderDetl.setOrderNo(outDetTB.getBillNo());
orderDetl.setOutOrderNo(outDetTB.getOrderNo());
orderDetl.setAutoId(outDetTB.getAutoId());
- orderDetl.setLuHao(outDetTB.getLuHao());
+ orderDetl.setSpecs(mat.getSpecs());
+ orderDetl.setDetId(outDetTB.getDetId());
+// orderDetl.setLuHao(outDetTB.getLuHao());
orderDetl.setSpecs(outDetTB.getSPgNO());
+ orderDetl.setSuppCode(inHedTB.getObjectId());
+ orderDetl.setSupp(inHedTB.getObjectName());
orderDetl.setPacking(outDetTB.getPacking());
orderDetl.setWareId(outDetTB.getWareId());
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());
orderDetl.setTemp3(outDetTB.getTemp3());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setThreeCode(outDetTB.getDetId() + "");
+ orderDetl.setThreeCode(outDetTB.getTemp1());
+ orderDetl.setModel(outDetTB.getItemCode());
orderDetl.setCreateBy(9527L);
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
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