From 3450a17ba5c64d33c7b1e828369b2209eabd0edf Mon Sep 17 00:00:00 2001 From: Diss <1157651603@qq.com> Date: Mon, 15 Jan 2024 18:48:20 +0800 Subject: [PATCH] =?UTF-8?q?'%Y-%m-%d=20%H:%i'=20sql=E5=A4=AA=E9=95=BF=20?= =?UTF-8?q?=E6=95=B4=E5=BD=A2=E6=97=B6=E9=97=B4=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml | 2 +- .../main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml | 2 +- .../logpm/patch/service/impl/SyncServiceTypeServiceImpl.java | 1 + 3 files changed, 3 insertions(+), 2 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 80169f3f4..6a675d779 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 @@ -291,7 +291,7 @@ lwtg.tray_code trayCode, lwug.position_code positionCode, SUM(lwug.num) num, - GROUP_CONCAT(DISTINCT lwug.create_time SEPARATOR '、') upTime, + GROUP_CONCAT( DISTINCT DATE_FORMAT( lwug.create_time, '%Y-%m-%d %H:%i' ) SEPARATOR '、' ) AS upTime, GROUP_CONCAT(DISTINCT lwug.create_user SEPARATOR '、') upUser, (SELECT GROUP_CONCAT( DISTINCT ldsli.order_code) order_code FROM logpm_distribution_stock_list_info ldsli WHERE ldsli.incoming_batch = ldsl.incoming_batch diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml index b3722ce89..bd58d55a4 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml @@ -6,7 +6,7 @@ UPDATE logpm_distribution_stock_article ldsa LEFT JOIN logpm_basicdata_client lbc ON lbc.client_name = #{mallName} AND lbc.is_deleted = 0 - LEFT JOIN logpm_basicdata_store_business lbsb ON lbsb.client_id = lbc.id + LEFT JOIN logpm_basicdata_store_business lbsb ON lbsb.client_id = lbc.id AND lbsb.is_deleted = 0 SET ldsa.mall_id = COALESCE(lbc.id, ldsa.mall_id), ldsa.mall_code = COALESCE(lbc.client_code, ldsa.mall_code), ldsa.mall_name = COALESCE(lbc.client_name, ldsa.mall_name), diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java index 54560a76b..8128dd033 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java @@ -26,6 +26,7 @@ public class SyncServiceTypeServiceImpl implements ISyncServiceTypeService { @Override public void syncServiceType(String id, String warehouseName, String mallName) { + //根据包件码查询出订单号 DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(id); if (distributionParcelListEntity==null){ throw new ServiceException("订单号不存在");