From 89df8d43f0102f2ea3b46af7222c9c5c1ed902c0 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 8 Apr 2024 19:34:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E5=9C=A8=E6=89=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E6=89=98=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basicdata/vo/BasicdataTrayVO.java | 5 +++++ .../logpm/basicdata/mapper/BasicdataTrayMapper.xml | 6 ++++-- .../service/impl/BasicdataTrayServiceImpl.java | 13 +++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java index 3f04c1482..b19577a77 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java @@ -44,4 +44,9 @@ public class BasicdataTrayVO extends BasicdataTrayEntity { @ApiModelProperty(value = "禁用状态（值）") private String disableTypeName; + @ApiModelProperty(value = "打托方式") + private String trayType; + @ApiModelProperty(value = "打托方式显示") + private String trayTypeString; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 9aba33883..ded30ed53 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -60,9 +60,11 @@ tray.disable_type, tray.tray_status, warehouse.name AS warehouseName, - tray.`type` - FROM + tray.`type`, + lwtt.tray_type + lwtt FROM logpm_warehouse_tray AS tray + left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id INNER JOIN logpm_warehouse_warehouse AS warehouse ON tray.warehouse_id = warehouse.id tray.is_deleted = '0' diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index b1df8fcb7..67257ab44 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java @@ -44,6 +44,7 @@ import com.logpm.warehouse.vo.WarehouseTraybarCode; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.constant.CodeNumConstant; +import org.springblade.common.constant.DictBizConstant; import org.springblade.common.utils.QRCodeUtil; import org.springblade.common.utils.TemplateUtil; import org.springblade.core.log.exception.ServiceException; @@ -52,6 +53,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.system.cache.DictBizCache; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -148,13 +150,12 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl selectTrayList(IPage page, Map basicdataTray) { - //获取当前登录人仓库 -// List myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse(); -// List collect = myWatchWarehouse.stream() -// .map(BasicdataWarehouseEntity::getId) -// .collect(Collectors.toList()); -// basicdataTray.put("warehouseList",collect); IPage trayList= trayMapper.selectTrayList(page,basicdataTray); + for (int i = 0; i < trayList.getRecords().size(); i++) { + if(ObjectUtils.isNotNull(trayList.getRecords().get(i).getTrayType())){ + trayList.getRecords().get(i).setTrayTypeString(DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayList.getRecords().get(i).getTrayType())); + } + } return trayList; }