From 83c74fca5c241f0205a57aae96a7e8cdfafd4a1c Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 11 Nov 2023 17:08:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../appcontroller/DistributionStockupAppController.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
index 24379d128..29094d395 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
@@ -752,6 +752,9 @@ public class DistributionStockupAppController extends BladeController {
if(ObjectUtils.isNotNull(list) && list.size() > 1){
throw new ServiceException("查询到重复包条信息！！");
}
+ if(ObjectUtils.isNull(list)){
+ throw new ServiceException("没有查询到包件信息");
+ }
WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity();
warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId());
warehouseUpdownGoodsEntity.setAssociationId(list.get(0).getId());
From 808372c1bbfe508abaaf37f372b1139bd34fd6dd Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 11 Nov 2023 18:21:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
=?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../distribution/vo/DistributionStockupStockListVO.java | 1 +
.../distribution/mapper/DistributionReservationMapper.xml | 3 ++-
.../logpm/distribution/mapper/DistributionStockupMapper.xml | 6 ++++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java
index a0517a9de..f4060953d 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java
@@ -31,5 +31,6 @@ public class DistributionStockupStockListVO implements Serializable {
private Boolean trayLean;//整托状态
private Integer unpack;//是否拆包 0 没有 1 拆了
+ private String sourceType;//是否拆包 1 订单 2导入
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index eff73905c..a8cb46aa4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -240,6 +240,7 @@
ldst.cargo_unit cargoUnit,
ldst.tray_name trayName,
ldst.unpack unpack,
+ ldst.source_type sourceType,
count(ldss.id) realNum,
CASE
WHEN ldst.source_type = '2' THEN
@@ -265,7 +266,7 @@
where ldrs.reservation_id = #{reservationId}
and ldrs.is_deleted = 0
group by ldst.id, ldst.storage_location, ldst.description_goods, ldst.sku,ldrs.id,
- ldst.cargo_norms, ldrs.reservation_num, ldst.cargo_unit, ldst.tray_name, ldst.unpack
+ ldst.cargo_norms, ldrs.reservation_num, ldst.cargo_unit, ldst.tray_name, ldst.source_type