From 349bcef9a96391d22522a3409adf5a89e7e70a95 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十月 2023 08:46:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev
---
server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
index 65607da..51661fd 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WTransferServiceImpl.java
@@ -323,9 +323,9 @@
if(!Objects.isNull(i.getInWarehouseId())){
sub.append(i.getInWarehouseId());
}
-// if(!Objects.isNull(i.getOutLocationId())){
-// sub.append(i.getOutLocationId());
-// }
+ if(!Objects.isNull(i.getOutLocationId())){
+ sub.append(i.getOutLocationId());
+ }
// if(!Objects.isNull(i.getInLocationId())){
// sub.append(i.getInLocationId());
// }
@@ -894,6 +894,9 @@
queryWStockDto.setQualityType(wTransferDetail.getQualityType());
if(!Objects.isNull(wTransferDetail.getProcedureId())){
queryWStockDto.setProcedureId(wTransferDetail.getProcedureId());
+ }
+ if(!Objects.isNull(wTransferDetail.getOutLocationId())){
+ queryWStockDto.setLocationId(wTransferDetail.getOutLocationId());
}
//鑾峰彇浠撳簱淇℃伅 鏍规嵁
Warehouse warehouse = warehouseMapper.selectById(wTransferDetail.getOutWarehouseId());
@@ -2301,7 +2304,7 @@
wOutboundDetail.setOutboundId(wOutbound.getId());
wOutboundDetail.setMaterialId(wTransferDetail.getMaterialId());
wOutboundDetail.setUnitId(wTransferDetail.getUnitId());
- wOutboundDetail.setBatch(wTransferDetail.getBatch());
+ wOutboundDetail.setBatch(wStock.getBatch());
wOutboundDetail.setWarehouseId(wOutbound.getWarehouseId());
wOutboundDetail.setLocationId(wStock.getLocationId());
wOutboundDetail.setNum(wTransferDetail.getOutActnum());
--
Gitblit v1.9.3