Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/service/iostorinv/IostorInvServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.code.nl.framework.common.pojo.CommonResult;
 import cn.code.nl.module.base.api.codegen.CodeGenApi;
 import cn.code.nl.module.base.api.codegen.dto.CodeGenerateReqDTO;
+import cn.code.nl.module.wms.dal.dataobject.bsrealstorattr.BsrealStorAttrDO;
 import cn.code.nl.module.wms.dal.dataobject.iostorinvdtl.IostorinvDtlDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -23,9 +24,13 @@ import cn.code.nl.framework.common.util.object.BeanUtils;
 
 import cn.code.nl.module.wms.dal.mysql.iostorinv.IostorInvMapper;
 import cn.code.nl.module.wms.dal.mysql.iostorinvdtl.IostorinvDtlMapper;
+import cn.code.nl.module.wms.dal.mysql.bsrealstorattr.BsrealStorAttrMapper;
+import cn.code.nl.framework.mybatis.core.query.LambdaQueryWrapperX;
 
 import static cn.code.nl.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.code.nl.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.code.nl.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.code.nl.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.code.nl.framework.common.util.collection.CollectionUtils.diffList;
 import static cn.code.nl.module.wms.enums.ErrorCodeConstants.*;
 
@@ -45,6 +50,9 @@ public class IostorInvServiceImpl implements IostorInvService {
     @Resource
     private IostorinvDtlMapper iostorinvDtlMapper;
 
+    @Resource
+    private BsrealStorAttrMapper bsrealStorAttrMapper;
+
     @Resource
     private CodeGenApi codeGenApi;
 
@@ -219,7 +227,17 @@ public class IostorInvServiceImpl implements IostorInvService {
 
     @Override
     public PageResult<IostorInvDO> getIostorInvPage(IostorInvPageReqVO pageReqVO) {
-        return iostorInvMapper.selectPage(pageReqVO);
+        PageResult<IostorInvDO> pageResult = iostorInvMapper.selectPage(pageReqVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return pageResult;
+        }
+        Set<String> storIds = convertSet(pageResult.getList(), IostorInvDO::getStorId);
+        Map<String, String> storNameMap = convertMap(
+                bsrealStorAttrMapper.selectList(new LambdaQueryWrapperX<BsrealStorAttrDO>()
+                        .in(BsrealStorAttrDO::getStorId, storIds)),
+                BsrealStorAttrDO::getStorId, BsrealStorAttrDO::getStorName);
+        pageResult.getList().forEach(item -> item.setStorName(storNameMap.get(item.getStorId())));
+        return pageResult;
     }
 
 }

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/iostorinv/data.ts

@@ -340,6 +340,10 @@ export function useGridColumns(): VxeTableGridOptions<WmsIostorInvApi.IostorInv>
       field: 'billType',
       title: '单据类型',
       minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.WMS_OUT_BILL_TYPE },
+      },
     },
     {
       field: 'bizDate',