feat(wms): 出库单增加客户名称字段并优化仓库选择功能

- 在 WmsOutstockOrder 模型中添加 customerName 字段
- 在 WmsOutstockOrderBo 中添加 customerName 字段并进行校验
- 在 WmsOutstockOrderServiceImpl 中实现客户名称的关联查询
- 在 WmsOutstockOrderVo 中添加 customerName 字段用于展示
- 优化仓库选择界面的错误提示信息
master
zangch@mesnac.com 4 months ago
parent ce1129e028
commit 3d0cab34ef

@ -119,4 +119,10 @@ public class WmsOutstockOrder {
@TableField(exist = false)
private String warehouseName;//字段映射
/**
*
*/
@TableField(exist = false)
private String customerName;
}

@ -1,8 +1,12 @@
package org.dromara.wms.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.wms.domain.WmsOutstockOrder;
@ -29,7 +33,7 @@ public class WmsOutstockOrderBo extends BaseEntity {
/**
* ID
*/
// @NotNull(message = "仓库ID不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "仓库不能为空", groups = { AddGroup.class, EditGroup.class })
private Long warehouseId;
/**
@ -41,7 +45,7 @@ public class WmsOutstockOrderBo extends BaseEntity {
/**
*
*/
// @NotBlank(message = "出库类型不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "出库类型不能为空", groups = { AddGroup.class, EditGroup.class })
private String outstockType;
/**

@ -134,4 +134,9 @@ public class WmsOutstockOrderVo implements Serializable {
*/
private String warehouseName;
/**
*
*/
private String customerName;
}

@ -12,6 +12,7 @@ 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.BaseMaterialCategory;
import org.dromara.wms.domain.WmsBaseCustomer;
import org.dromara.wms.domain.WmsBaseWarehouse;
import org.dromara.wms.domain.WmsOutstockOrder;
import org.dromara.wms.domain.bo.WmsOutstockOrderBo;
@ -86,9 +87,13 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
// 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockOrder::getMaterialCategoryId)
// 关联表查询仓库名称
.select(WmsBaseWarehouse::getWarehouseCode, WmsBaseWarehouse::getWarehouseName)
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId);
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId)
//关联查询客户名称
.select(WmsBaseCustomer::getCustomerName)
.leftJoin(WmsBaseCustomer.class, WmsBaseCustomer::getCustomerId, WmsOutstockOrder::getCustomerId);
lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId());
lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId());

Loading…
Cancel
Save