From c85369f8936e8a474af2fd482a419fb7b529607f Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 十月 2025 21:57:39 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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..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,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());
}
@@ -118,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());
@@ -139,9 +142,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;
}
@@ -150,7 +155,7 @@
/**
* @return
*/
- @Transactional(rollbackFor = Throwable.class)
+ @Transactional
public boolean createOutOrder(OutHedTB inHedTB, List<OutDetTB> inDetTBs) {
Order order = orderService.selectByNo(inHedTB.getBillNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
@@ -218,20 +223,25 @@
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);
@@ -239,9 +249,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