将每一步的钢卷二维码进行保存,新步骤采用新码
This commit is contained in:
@@ -75,22 +75,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 如果查询到的是历史数据,尝试查找对应的当前数据
|
||||
if (vo.getDataType() != null && vo.getDataType() == 0) {
|
||||
// 根据入场钢卷号查找当前数据
|
||||
LambdaQueryWrapper<WmsMaterialCoil> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(WmsMaterialCoil::getEnterCoilNo, vo.getEnterCoilNo())
|
||||
.eq(WmsMaterialCoil::getDataType, 1) // 查找当前数据
|
||||
.orderByDesc(WmsMaterialCoil::getCreateTime); // 按创建时间倒序,获取最新的
|
||||
|
||||
List<WmsMaterialCoilVo> currentDataList = baseMapper.selectVoList(lqw);
|
||||
if (!currentDataList.isEmpty()) {
|
||||
// 如果找到当前数据,返回最新的当前数据
|
||||
vo = currentDataList.get(0);
|
||||
}
|
||||
// 如果没有找到当前数据,仍然返回历史数据供查看
|
||||
}
|
||||
|
||||
// 查询关联对象
|
||||
fillRelatedObjects(vo);
|
||||
|
||||
@@ -540,12 +524,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
WmsMaterialCoil newCoil = BeanUtil.toBean(newCoilBo, WmsMaterialCoil.class);
|
||||
newCoil.setCoilId(null);
|
||||
newCoil.setDataType(1);
|
||||
// 继承原钢卷的基本信息
|
||||
// 继承原钢卷的基本信息(强制继承,不能修改的字段)
|
||||
newCoil.setEnterCoilNo(oldCoil.getEnterCoilNo());
|
||||
newCoil.setSupplierCoilNo(oldCoil.getSupplierCoilNo()); // 保留厂家原料卷号
|
||||
newCoil.setItemType(oldCoil.getItemType());
|
||||
newCoil.setItemId(oldCoil.getItemId());
|
||||
newCoil.setTeam(oldCoil.getTeam());
|
||||
// 如果前端没传team,使用原钢卷的team
|
||||
if (newCoil.getTeam() == null) {
|
||||
newCoil.setTeam(oldCoil.getTeam());
|
||||
}
|
||||
// 如果没有指定库区,使用原库区
|
||||
if (newCoil.getWarehouseId() == null) {
|
||||
newCoil.setWarehouseId(oldCoil.getWarehouseId());
|
||||
|
||||
Reference in New Issue
Block a user