Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrder.java

@@ -126,10 +126,20 @@ public class WmsAllocateOrder{
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+
+
+    /**
+     * 仓库
+     */
     @TableField(exist = false)
-    private String planWarehouseCode;
+    private String planWarehouseCode;//字段映射
     @TableField(exist = false)
-    private String targetWarehouseCode;
+    private String targetWarehouseCode;//字段映射
+    @TableField(exist = false)
+    private String planWarehouseName;//字段映射
+    @TableField(exist = false)
+    private String targetWarehouseName;//字段映射
+
 
     /**
      * 物料大类

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrderDetail.java

@@ -81,6 +81,12 @@ public class WmsAllocateOrderDetail {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+
+    /**
+     * 物料名称
+     */
+    @TableField(exist = false)
+    private String materialName;
     @TableField(exist = false)
     private String materialCode;
 

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsAllocateOrderDetailVo.java

@@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.wms.domain.WmsAllocateOrderDetail;

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsAllocateOrderVo.java

@@ -149,8 +149,12 @@ public class WmsAllocateOrderVo implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+
+    // 字段映射 仓库
     private String planWarehouseCode;
     private String targetWarehouseCode;
+    private String planWarehouseName;
+    private String targetWarehouseName;
 
     /**
      * 物料大类

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java

@@ -3,6 +3,7 @@ package org.dromara.wms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
@@ -43,7 +44,7 @@ public class WmsAllocateOrderDetailServiceImpl implements IWmsAllocateOrderDetai
      * @return 调拨子
      */
     @Override
-    public WmsAllocateOrderDetailVo queryById(Long aoDId) {
+    public WmsAllocateOrderDetailVo queryById(Long aoDId){
         return baseMapper.selectVoById(aoDId);
     }
 
@@ -70,13 +71,14 @@ public class WmsAllocateOrderDetailServiceImpl implements IWmsAllocateOrderDetai
      */
     @Override
     public List<WmsAllocateOrderDetailVo> queryList(WmsAllocateOrderDetailBo bo) {
-        LambdaQueryWrapper<WmsAllocateOrderDetail> lqw = buildQueryWrapper(bo);
+        MPJLambdaWrapper<WmsAllocateOrderDetail> lqw = buildJoinQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
 
-    private LambdaQueryWrapper<WmsAllocateOrderDetail> buildQueryWrapper(WmsAllocateOrderDetailBo bo) {
+    private MPJLambdaWrapper<WmsAllocateOrderDetail> buildQueryWrapper(WmsAllocateOrderDetailBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<WmsAllocateOrderDetail> lqw = Wrappers.lambdaQuery();
+        MPJLambdaWrapper<WmsAllocateOrderDetail> lqw = JoinWrappers.lambda(WmsAllocateOrderDetail.class);
+
         lqw.eq(bo.getAoDId() != null, WmsAllocateOrderDetail::getAoDId, bo.getAoDId());
         lqw.eq(StringUtils.isNotBlank(bo.getAllocateCode()), WmsAllocateOrderDetail::getAllocateCode, bo.getAllocateCode());
         lqw.eq(bo.getMaterialId() != null, WmsAllocateOrderDetail::getMaterialId, bo.getMaterialId());
@@ -85,12 +87,12 @@ public class WmsAllocateOrderDetailServiceImpl implements IWmsAllocateOrderDetai
         lqw.eq(bo.getErpSynchronousQty() != null, WmsAllocateOrderDetail::getErpSynchronousQty, bo.getErpSynchronousQty());
         return lqw;
     }
-
     private MPJLambdaWrapper<WmsAllocateOrderDetail> buildJoinQueryWrapper(WmsAllocateOrderDetailBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<WmsAllocateOrderDetail> lqw = JoinWrappers.lambda(WmsAllocateOrderDetail.class)
-            .selectAll(WmsAllocateOrderDetail.class).select(BaseMaterialInfo::getMaterialCode)
+            .selectAll(WmsAllocateOrderDetail.class)
-            .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsAllocateOrderDetail::getMaterialId);
+            .select(BaseMaterialInfo::getMaterialCode,BaseMaterialInfo::getMaterialName)
+            .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsAllocateOrderDetail::getMaterialId);
         lqw.eq(bo.getAoDId() != null, WmsAllocateOrderDetail::getAoDId, bo.getAoDId());
         lqw.eq(StringUtils.isNotBlank(bo.getAllocateCode()), WmsAllocateOrderDetail::getAllocateCode, bo.getAllocateCode());
         lqw.eq(bo.getMaterialId() != null, WmsAllocateOrderDetail::getMaterialId, bo.getMaterialId());

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderServiceImpl.java

@@ -1,30 +1,30 @@
 package org.dromara.wms.service.impl;
 
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.wms.domain.*;
+import org.dromara.wms.domain.BaseMaterialCategory;
+import org.dromara.wms.domain.WmsAllocateOrder;
+import org.dromara.wms.domain.WmsBaseWarehouse;
 import org.dromara.wms.domain.bo.WmsAllocateOrderBo;
-import org.dromara.wms.domain.bo.WmsReturnOrderBo;
 import org.dromara.wms.domain.vo.WmsAllocateOrderVo;
 import org.dromara.wms.mapper.WmsAllocateOrderMapper;
-import org.dromara.wms.mapper.WmsInstockOrderMapper;
 import org.dromara.wms.service.IWmsAllocateOrderService;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -81,11 +81,13 @@ public class WmsAllocateOrderServiceImpl implements IWmsAllocateOrderService {
             .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsAllocateOrder::getMaterialCategoryId)
 
 
-            .selectAs("a",WmsBaseWarehouse::getWarehouseCode,WmsAllocateOrderVo::getPlanWarehouseCode)
+            // 关联表查询仓库编码和名称，只需要一次连接
-            .selectAs("b",WmsBaseWarehouse::getWarehouseCode,WmsAllocateOrderVo::getTargetWarehouseCode)
+            .selectAs("a", WmsBaseWarehouse::getWarehouseCode, WmsAllocateOrderVo::getPlanWarehouseCode)
-            .leftJoin(WmsBaseWarehouse.class,"a",WmsBaseWarehouse::getWarehouseId,WmsAllocateOrder::getPlanWarehouseId)
+            .selectAs("a", WmsBaseWarehouse::getWarehouseName, WmsAllocateOrderVo::getPlanWarehouseName)
-                .leftJoin(WmsBaseWarehouse.class,"b",WmsBaseWarehouse::getWarehouseId,WmsAllocateOrder::getTargetWarehouseId);
+            .selectAs("b", WmsBaseWarehouse::getWarehouseCode, WmsAllocateOrderVo::getTargetWarehouseCode)
-
+            .selectAs("b", WmsBaseWarehouse::getWarehouseName, WmsAllocateOrderVo::getTargetWarehouseName)
+            .leftJoin(WmsBaseWarehouse.class, "a", WmsBaseWarehouse::getWarehouseId, WmsAllocateOrder::getPlanWarehouseId)
+            .leftJoin(WmsBaseWarehouse.class, "b", WmsBaseWarehouse::getWarehouseId, WmsAllocateOrder::getTargetWarehouseId);
 
         lqw.eq(bo.getAoId() != null, WmsAllocateOrder::getAoId, bo.getAoId());
         lqw.eq(StringUtils.isNotBlank(bo.getAllocateOrderCode()), WmsAllocateOrder::getAllocateOrderCode, bo.getAllocateOrderCode());