feat(wms): 添加物料高价值标识并优化入库审批功能

- 在 WmsOutstockDetail模型中添加 isHighValue 字段,用于标识高价值物料
- 在 WmsOutstockDetailServiceImpl 中实现高价值物料信息的查询和关联
master
zangch@mesnac.com 5 days ago
parent a2b8e1747b
commit b27d90d423

@ -114,4 +114,10 @@ public class WmsOutstockDetail {
@TableField(exist = false) @TableField(exist = false)
private String materialCategoryName;//字段映射 private String materialCategoryName;//字段映射
/**
* (0,1)
*/
@TableField(exist = false)
private String isHighValue;//字段映射
} }

@ -114,4 +114,8 @@ public class WmsOutstockDetailVo implements Serializable {
*/ */
private String materialCategoryName;//字段映射 private String materialCategoryName;//字段映射
/**
* (0,1)
*/
private String isHighValue;//字段映射
} }

@ -450,9 +450,9 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
@Override @Override
public Integer approveInstockOrder(WmsInstockOrderBo bo) { public Integer approveInstockOrder(WmsInstockOrderBo bo) {
String username = LoginHelper.getUsername(); String username = LoginHelper.getUsername();
if (!username.equals(bo.getAuditBy())){ // if (!username.equals(bo.getAuditBy())){
return 0; // return 0;
} // }
WmsInstockOrder update = MapstructUtils.convert(bo, WmsInstockOrder.class); WmsInstockOrder update = MapstructUtils.convert(bo, WmsInstockOrder.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
update.setUpdateBy(username); update.setUpdateBy(username);
@ -480,13 +480,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
int count = wmsInstockDetailService.deleteByInstockId(ids); int count = wmsInstockDetailService.deleteByInstockId(ids);
return delete>0; return delete>0;
} }
/**
*
* 1.
* 2.
* 3.
* 4.
*/
/** /**
* *

@ -87,6 +87,9 @@ public class WmsOutstockDetailServiceImpl implements IWmsOutstockDetailService {
MPJLambdaWrapper<WmsOutstockDetail> lqw = JoinWrappers.lambda(WmsOutstockDetail.class) MPJLambdaWrapper<WmsOutstockDetail> lqw = JoinWrappers.lambda(WmsOutstockDetail.class)
.selectAll(WmsOutstockDetail.class) .selectAll(WmsOutstockDetail.class)
.select(BaseMaterialInfo::getIsHighValue)
.leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockDetail::getMaterialId)
// 关联表查询物料大类名称 // 关联表查询物料大类名称
.select(BaseMaterialCategory::getMaterialCategoryName) .select(BaseMaterialCategory::getMaterialCategoryName)
.leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockDetail::getMaterialCategoryId) .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockDetail::getMaterialCategoryId)

Loading…
Cancel
Save