weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

仓库修改

Browse Source
This commit is contained in:
秦鸿展
2026-04-17 19:31:04 +08:00
parent c0fd835365
commit 3d235e48f6
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/warehouse/WarehouseApplicationService.java
+12 -11
View File
@@ -2,9 +2,6 @@ package com.mhd.basic.application.service.warehouse;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mhd.basic.domain.areaAggregate.repository.po.SysAreaPO;
import com.mhd.basic.domain.areaAggregate.repository.todo.SysProvinceCityCountyDO;
import com.mhd.basic.domain.areaAggregate.service.SysProvinceCityCountyDomainService;
import com.mhd.basic.domain.associationWarehouse.entity.AssociationWarehouse; import com.mhd.basic.domain.associationWarehouse.entity.AssociationWarehouse;
import com.mhd.basic.domain.associationWarehouse.repository.facade.IAssociationWarehouseService; import com.mhd.basic.domain.associationWarehouse.repository.facade.IAssociationWarehouseService;
import com.mhd.basic.domain.warehouse.repository.po.WarehousePO; import com.mhd.basic.domain.warehouse.repository.po.WarehousePO;
@@ -39,8 +36,6 @@ public class WarehouseApplicationService {
@Autowired @Autowired
private ISysDictTypeService dictTypeService; private ISysDictTypeService dictTypeService;
@Autowired @Autowired
private SysProvinceCityCountyDomainService sysProvinceCityCountyDomainService;
@Autowired
private IAssociationWarehouseService associationWarehouseService; private IAssociationWarehouseService associationWarehouseService;
@@ -180,14 +175,20 @@ public class WarehouseApplicationService {
} }
SysDictData warmLayerDictDataVo = warmLayerDictDataList.stream().filter(info -> ObjectUtil.equal(info.getDictValue(), warehouseDO.getWarmLayerCode())).findAny().orElse(null); SysDictData warmLayerDictDataVo = warmLayerDictDataList.stream().filter(info -> ObjectUtil.equal(info.getDictValue(), warehouseDO.getWarmLayerCode())).findAny().orElse(null);
if (null == warmLayerDictDataVo) { if (null == warmLayerDictDataVo) {
throw new ServiceException("温层类型【" + warehouseDO.getWarehouseType() + "】数据字典不存在 请联系管理员"); throw new ServiceException("温层类型【" + warehouseDO.getWarmLayerCode() + "】数据字典不存在 请联系管理员");
} }
warehouseDO.setWarmLayerName(warmLayerDictDataVo.getDictLabel()); warehouseDO.setWarmLayerName(warmLayerDictDataVo.getDictLabel());
//翻译省市区 // 翻译省市区（已注释：不再根据 regionCode 回填 regionName）
SysProvinceCityCountyDO loadingProvinceCityCountyDO = new SysProvinceCityCountyDO(); /*
loadingProvinceCityCountyDO.setCountyCode(Long.parseLong(warehouseDO.getRegionCode())); if (StrUtil.isNotBlank(warehouseDO.getRegionCode())) {
SysAreaPO sysAreaPO = sysProvinceCityCountyDomainService.findAreaInfo(loadingProvinceCityCountyDO); SysProvinceCityCountyDO loadingProvinceCityCountyDO = new SysProvinceCityCountyDO();
warehouseDO.setRegionName(sysAreaPO.getProvinceCityCountyName()); loadingProvinceCityCountyDO.setCountyCode(Long.parseLong(warehouseDO.getRegionCode().trim()));
SysAreaPO sysAreaPO = sysProvinceCityCountyDomainService.findAreaInfo(loadingProvinceCityCountyDO);
if (sysAreaPO != null) {
warehouseDO.setRegionName(sysAreaPO.getProvinceCityCountyName());
}
}
*/
} }
/** /**