feat(wms): 仓库管理-出库单相关功能优化

- 在 WmsOutstockOrder、WmsOutstockOrderBo 和 WmsOutstockOrderVo 中添加仓库名称字段
- 在查询出库单信息时,增加仓库名称的查询和显示
- 优化出库单新增逻辑,处理子表数据的保存
master
zangch@mesnac.com 4 months ago
parent 5edc0b7966
commit a8ff530973

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

@ -92,6 +92,11 @@ public class WmsOutstockOrderBo extends BaseEntity {
*/ */
private Long customerId; private Long customerId;
/**
*
*/
private String warehouseName;
private List<WmsOutstockDetailBo> detailList; private List<WmsOutstockDetailBo> detailList;
} }

@ -129,4 +129,9 @@ public class WmsOutstockOrderVo implements Serializable {
*/ */
private String materialCategoryName;//字段映射 private String materialCategoryName;//字段映射
/**
*
*/
private String warehouseName;
} }

@ -87,8 +87,9 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
.select(BaseMaterialCategory::getMaterialCategoryName) .select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockOrder::getMaterialCategoryId) .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockOrder::getMaterialCategoryId)
.select(WmsBaseWarehouse::getWarehouseCode) .select(WmsBaseWarehouse::getWarehouseCode, WmsBaseWarehouse::getWarehouseName)
.leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId); .leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId);
lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId()); lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId());
lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId()); lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId());
lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockOrder::getOutstockCode, bo.getOutstockCode()); lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockOrder::getOutstockCode, bo.getOutstockCode());
@ -100,7 +101,7 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
lqw.eq(bo.getAuditTime() != null, WmsOutstockOrder::getAuditTime, bo.getAuditTime()); lqw.eq(bo.getAuditTime() != null, WmsOutstockOrder::getAuditTime, bo.getAuditTime());
lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsOutstockOrder::getAuditStatus, bo.getAuditStatus()); lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsOutstockOrder::getAuditStatus, bo.getAuditStatus());
lqw.eq(StringUtils.isNotBlank(bo.getAuditComments()), WmsOutstockOrder::getAuditComments, bo.getAuditComments()) lqw.eq(StringUtils.isNotBlank(bo.getAuditComments()), WmsOutstockOrder::getAuditComments, bo.getAuditComments())
.orderByAsc(WmsOutstockOrder::getCreateTime); .orderByDesc(WmsOutstockOrder::getCreateTime);
return lqw; return lqw;
} }
/** /**
@ -209,6 +210,20 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService {
if (flag) { if (flag) {
bo.setOutstockId(add.getOutstockId()); bo.setOutstockId(add.getOutstockId());
} }
// 处理子表数据设置outstockCode和outstockId
if (bo.getDetailList() != null && !bo.getDetailList().isEmpty()) {
bo.getDetailList().forEach(detail -> {
detail.setOutstockCode(outStockOrder);
detail.setOutstockId(add.getOutstockId());
// 如果前端没有传递materialCategoryId使用主表的
if (detail.getMaterialCategoryId() == null) {
detail.setMaterialCategoryId(add.getMaterialCategoryId());
}
});
wmsOutstockDetailService.insertByBo(bo.getDetailList());
}
// 根据出库单号查询最新出库单信息 // 根据出库单号查询最新出库单信息
LambdaQueryWrapper<WmsOutstockOrder> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<WmsOutstockOrder> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(WmsOutstockOrder::getOutstockCode, outStockOrder); wrapper.eq(WmsOutstockOrder::getOutstockCode, outStockOrder);

Loading…
Cancel
Save