From 9052fef232f56eb878d7cf8360a09a11e6a0fe2f Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 06 六月 2025 10:48:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 20 ++++++++++++++------
1 files changed, 14 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 eaa18fb..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,7 +51,7 @@
/**
* @return
*/
- @Transactional(rollbackFor = Throwable.class)
+ @Transactional
public boolean createInOrder(InHedTB inHedTB, List<InDetTB> inDetTBs) {
Order order = orderService.selectByNo(inHedTB.getBillNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
@@ -118,9 +118,12 @@
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());
@@ -152,7 +155,7 @@
/**
* @return
*/
- @Transactional(rollbackFor = Throwable.class)
+ @Transactional
public boolean createOutOrder(OutHedTB inHedTB, List<OutDetTB> inDetTBs) {
Order order = orderService.selectByNo(inHedTB.getBillNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
@@ -220,8 +223,12 @@
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());
@@ -233,7 +240,8 @@
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);
--
Gitblit v1.9.1