From 81ca0d9068f816403e8cdf32437366f9efb6380f Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 8 Apr 2024 11:54:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9C=A8=E5=BA=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DistributionStockArticleController.java | 2 +- .../distribution/mapper/DistributionStockArticleMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 03b5ae41c..3800e5f07 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -447,7 +447,7 @@ public class DistributionStockArticleController extends BladeController { public void exportDistributionStockArticle(@ApiIgnore @RequestParam Map paramMap, BladeUser bladeUser, HttpServletResponse response) { List list = distributionStockArticleService.exportDistributionStockArticle(paramMap); - ExcelUtil.export(response, "已签订单数据" + DateUtil.time(), "已签订单数据数据表", list, DistributionStockArticleExcel.class); + ExcelUtil.export(response, "在库订单明细" + DateUtil.time(), "在库订单明细", list, DistributionStockArticleExcel.class); } // /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 693f0ff1a..e05eddea6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -832,7 +832,7 @@ left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id left join logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id - ldsa.is_deleted = 0 + ldsa.is_deleted = 0 and ldsa.order_status != '80' and ldsa.warehouse_id = #{paramMap.warehouseId}