From fe6f50870bd2991741ea079bb4b5e3f7dda7c969 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 25 Oct 2023 10:03:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=B4=A7=E4=BD=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml | 8 +++----- .../service/IDistributionStockArticleService.java | 7 ++----- .../impl/DistributionStockArticleServiceImpl.java | 9 +++++++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml index 98e612f18..23514577e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml @@ -185,7 +185,7 @@ SELECT ldsa.order_code orderCode, ldsa.mall_name mallName, - CONCAT(ldsa.customer_name, COALESCE(' (' || ldsa.customer_telephone || ')', '')) customerName, + CONCAT(ldsa.customer_name, '(', ldsa.customer_telephone, ')') customerName, GROUP_CONCAT(ldpl.material_name SEPARATOR '、') materialName, GROUP_CONCAT(ldpl.material_code SEPARATOR '、') materialCode, GROUP_CONCAT(ldpl.third_product SEPARATOR '、') thirdProduct, @@ -237,9 +237,7 @@ ldpl.firsts_code firstsCode, ldpl.second second, ldsa.mall_name mallName, - - - CONCAT(ldsa.customer_name, COALESCE(' (' || ldsa.customer_telephone || ')', '')) customerName, + CONCAT(ldsa.customer_name, '(', ldsa.customer_telephone, ')') customerName, ldpl.second_code secondCode, ldpl.third_product thirdProduct, ldpl.third_code thirdCode, @@ -366,7 +364,7 @@ SELECT ldsa.waybill_number waybillNumber, ldsa.description_goods descriptionGoods, - CONCAT(ldsa.consignee_person, COALESCE(' (' || ldsa.consignee_mobile || ')', '')) consigneePerson, + CONCAT(ldsa.consignee_person, '(', ldsa.consignee_mobile, ')') consigneePerson, CONCAT(lwug.position_code, '（', SUM(lwug.num), '）') positionInfo, GROUP_CONCAT( lwtg.tray_code SEPARATOR ',' ) trayCode, GROUP_CONCAT( lwug.create_user SEPARATOR ',' ) upUser, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index e73bf224a..5f9973700 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java @@ -21,10 +21,7 @@ import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.dto.app.queryOrderDTO; import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.excel.DistributionStockArticleExcel; -import com.logpm.distribution.vo.DistributionParcelListVO; -import com.logpm.distribution.vo.DistributionParcelNumberVO; -import com.logpm.distribution.vo.DistributionStockArticleVO; -import com.logpm.distribution.vo.OrderPackgeCodeDataVO; +import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.queryOrderVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; @@ -182,5 +179,5 @@ public interface IDistributionStockArticleService extends BaseService getPackageListByStockArticleId(IPage page, Long orderId); - Object selectTemplate(List ids); + List selectTemplate(List ids); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 97890883c..c2dd0fbdb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1149,8 +1149,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl ids) { - return null; + public List selectTemplate(List ids) { + ArrayList arrayList = new ArrayList<>(); + for (Long id : ids) { + DistributionStockArticleQRCodeVO orderNoList = baseMapper.getOrderNoList(null,String.valueOf(id)); + arrayList.add(orderNoList); + } + return arrayList; }