From a9ecd6e702420bd255bfc19b2e2add4dd57d8f41 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 24 Jun 2022 14:53:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E5=87=8F1=20=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E5=BA=93=E7=A0=81=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/service/inout/impl/CodesServiceImpl.java | 2 +- .../glxp/sale/admin/service/inout/impl/OrderServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java index 1fe8942..322f5bd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -212,6 +211,7 @@ public class CodesServiceImpl implements CodesService { filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk()); filterInvProductRequest.setSupId(invProductDetailEntity.getSupId()); filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode()); + filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode()); if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) { filterInvProductRequest.setBatchNo("empty"); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 0e53a90..f9dad67 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -428,6 +428,7 @@ public class OrderServiceImpl implements OrderService { filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk()); filterInvProductRequest.setSupId(invProductDetailEntity.getSupId()); filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode()); + filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode()); if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) { filterInvProductRequest.setBatchNo("empty"); } else {