feat(wms): 增加移库订单和出库记录的关联查询功能

- 在 WmsMoveOrder 模型中添加仓库名称和物料名称字段
- 更新 WmsMoveOrderServiceImpl 以关联查询仓库名称和物料名称
- 在 WmsMoveOrderVo 中添加仓库名称和物料名称字段
- 在 WmsOutstockRecord 模型中添加用户账号和昵称字段
- 更新 WmsOutstockRecordServiceImpl 以关联查询用户昵称和账号
- 在 WmsOutstockRecordVo 中添加用户账号和昵称字段

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

@@ -109,8 +109,19 @@ public class WmsMoveOrder{
     private String updateBy;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String createBy;
+
+    /**
+     * 仓库名称
+     */
+    @TableField(exist = false)
+    private String warehouseName;
     @TableField(exist = false)
     private String warehouseCode;
+    /**
+     * 物料名称
+     */
+    @TableField(exist = false)
+    private String materialName;
     @TableField(exist = false)
     private String materialCode;
 
@@ -121,4 +132,6 @@ public class WmsMoveOrder{
     @TableField(exist = false)
     private String materialCategoryName;//字段映射
 
+
+
 }

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

@@ -110,4 +110,16 @@ public class WmsOutstockRecord extends TenantEntity {
     @TableField(exist = false)
     private String materialCategoryName;//字段映射
 
+    /**
+     * 用户账号
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    @TableField(exist = false)
+    private String nickName;
+
 }

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

@@ -129,10 +129,16 @@ public class WmsMoveOrderVo implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+
+    /**
+     * 仓库名称
+     */
+    @TableField(exist = false)
+    private String warehouseName;
     @TableField(exist = false)
     private String warehouseCode;
-    @TableField(exist = false)
-    private String materialCode;
+
+
 
     /**
      * 物料大类
@@ -143,4 +149,12 @@ public class WmsMoveOrderVo implements Serializable {
     // 批次条码 插入
     private String batchCode;
 
+    /**
+     * 物料名称
+     */
+    @TableField(exist = false)
+    private String materialName;
+    @TableField(exist = false)
+    private String materialCode;
+
 }

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

@@ -124,4 +124,14 @@ public class WmsOutstockRecordVo implements Serializable {
      */
     private String materialCategoryName;//字段映射
 
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
 }

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

@@ -10,7 +10,10 @@ 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.BaseMaterialInfo;
+import org.dromara.wms.domain.WmsBaseWarehouse;
+import org.dromara.wms.domain.WmsInventory;
+import org.dromara.wms.domain.WmsMoveOrder;
 import org.dromara.wms.domain.bo.WmsMoveOrderBo;
 import org.dromara.wms.domain.vo.WmsInventoryVo;
 import org.dromara.wms.domain.vo.WmsMoveOrderVo;
@@ -79,14 +82,15 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService {
     private MPJLambdaWrapper<WmsMoveOrder> buildQueryWrapper(WmsMoveOrderBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<WmsMoveOrder> lqw = JoinWrappers.lambda(WmsMoveOrder.class)
-
+            .selectAll(WmsMoveOrder.class)
             // 关联表查询物料大类名称
-            .select(BaseMaterialCategory::getMaterialCategoryName)
-            .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsMoveOrder::getMaterialCategoryId)
-
-            .selectAll(WmsMoveOrder.class).select(WmsBaseWarehouse::getWarehouseCode).select(BaseMaterialInfo::getMaterialCode)
+//            .select(BaseMaterialCategory::getMaterialCategoryName)
+            // 关联表查询仓库名称
+            .select(WmsBaseWarehouse::getWarehouseCode, WmsBaseWarehouse::getWarehouseName)
             .leftJoin(WmsBaseWarehouse.class,WmsBaseWarehouse::getWarehouseId,WmsMoveOrder::getWarehouseId)
-         .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsMoveOrder::getMaterialId)
+            .select(BaseMaterialInfo::getMaterialCode,BaseMaterialInfo::getMaterialName)
+            .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsMoveOrder::getMaterialId)
+
         .eq(bo.getMoveId() != null, WmsMoveOrder::getMoveId, bo.getMoveId())
         .eq(bo.getMaterialId() != null, WmsMoveOrder::getMaterialId, bo.getMaterialId())
         .eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsMoveOrder::getMaterialCategoryId, bo.getMaterialCategoryId())

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

@@ -10,6 +10,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.wms.domain.BaseMaterialCategory;
 import org.dromara.wms.domain.BaseMaterialInfo;
+import org.dromara.wms.domain.SysUser;
 import org.dromara.wms.domain.WmsOutstockRecord;
 import org.dromara.wms.domain.bo.WmsOutstockRecordBo;
 import org.dromara.wms.domain.bo.WmsReturnOrderBo;
@@ -86,6 +87,9 @@ public class WmsOutstockRecordServiceImpl implements IWmsOutstockRecordService {
             // 关联表查询物料大类名称
             .select(BaseMaterialCategory::getMaterialCategoryName)
             .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockRecord::getMaterialCategoryId)
+            //
+            .select(SysUser::getNickName, SysUser::getUserName)
+            .leftJoin(SysUser.class, SysUser::getUserId, WmsOutstockRecord::getCreateBy)
 
             .select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName,BaseMaterialInfo::getMaterialUnit,BaseMaterialInfo::getMaterialSpec)
             .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsOutstockRecord::getMaterialId)