forked from BaoKaiWms/202501-Wms-Kate-Wuxi
1. 增加入库的库存更新记录
This commit is contained in:
parent
e41905ab78
commit
e9af1f12fe
|
|
@ -65,6 +65,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
* 输送线任务服务
|
||||
*/
|
||||
private final IConveyTaskService conveyTaskService;
|
||||
/**
|
||||
* 库存更新服务
|
||||
*/
|
||||
private final ITAppStockUpdateService appStockUpdateService;
|
||||
/**
|
||||
* 业务通用
|
||||
*/
|
||||
|
|
@ -311,6 +315,8 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
List<String> goodsIds = new ArrayList<>();
|
||||
// 新的库存信息
|
||||
List<TAppStock> newStockList = new ArrayList<>();
|
||||
// 库存更新记录
|
||||
List<TAppStockUpdate> stockUpdateList = new ArrayList<>();
|
||||
// 入库记录
|
||||
List<TAppTaskBak> newTaskBakList = new ArrayList<>();
|
||||
// 需要删除的任务id
|
||||
|
|
@ -352,7 +358,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
}
|
||||
}
|
||||
// 新库存,增加库存信息
|
||||
newStockList.add(new TAppStock(
|
||||
TAppStock thisTimeNewStock = new TAppStock(
|
||||
UUIDUtils.getNewUUID(),
|
||||
vehicleId,
|
||||
thisVehicleInTask.getDestination(),
|
||||
|
|
@ -371,7 +377,21 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
sledDays,
|
||||
null,
|
||||
null
|
||||
));
|
||||
);
|
||||
newStockList.add(thisTimeNewStock);
|
||||
// 库存更新记录
|
||||
TAppStockUpdate stockUpdate = new TAppStockUpdate(
|
||||
UUIDUtils.getNewUUID(),
|
||||
thisTimeNewStock.getVehicleId(),
|
||||
thisTimeNewStock.getGoodsId(),
|
||||
thisTimeNewStock.getFirstInTime(),
|
||||
0,
|
||||
thisTimeNewStock.getRealNum(),
|
||||
thisVehicleInTask.getOrigin() + ":入库",
|
||||
LocalDateTime.now(),
|
||||
thisVehicleInTask.getOpUser()
|
||||
);
|
||||
stockUpdateList.add(stockUpdate);
|
||||
}
|
||||
}
|
||||
// 当前载具是否是空载具
|
||||
|
|
@ -416,6 +436,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
if (!newStockList.isEmpty()) {
|
||||
appStockService.saveOrUpdateBatch(newStockList);
|
||||
}
|
||||
// 增加库存更新记录
|
||||
if (!stockUpdateList.isEmpty()) {
|
||||
appStockUpdateService.saveBatch(stockUpdateList);
|
||||
}
|
||||
// 添加任务记录
|
||||
if (!newTaskBakList.isEmpty()) {
|
||||
appTaskBakService.saveBatch(newTaskBakList);
|
||||
|
|
@ -457,6 +481,8 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
List<String> goodsIds = new ArrayList<>();
|
||||
// 新的库存信息
|
||||
List<TAppStock> newStockList = new ArrayList<>();
|
||||
// 库存更新记录
|
||||
List<TAppStockUpdate> stockUpdateList = new ArrayList<>();
|
||||
// 待删除的库存信息
|
||||
List<String> needDeleteStockIds = new ArrayList<>();
|
||||
// 入库记录
|
||||
|
|
@ -508,7 +534,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
}
|
||||
if (oldStockList.isEmpty()) {
|
||||
// 新库存,增加库存信息
|
||||
newStockList.add(new TAppStock(
|
||||
TAppStock thisTimeNewStock = new TAppStock(
|
||||
UUIDUtils.getNewUUID(),
|
||||
vehicleId,
|
||||
thisVehicleInTask.getDestination(),
|
||||
|
|
@ -527,7 +553,21 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
sledDays,
|
||||
null,
|
||||
null
|
||||
));
|
||||
);
|
||||
newStockList.add(thisTimeNewStock);
|
||||
// 库存更新记录
|
||||
TAppStockUpdate stockUpdate = new TAppStockUpdate(
|
||||
UUIDUtils.getNewUUID(),
|
||||
thisTimeNewStock.getVehicleId(),
|
||||
thisTimeNewStock.getGoodsId(),
|
||||
thisTimeNewStock.getFirstInTime(),
|
||||
0,
|
||||
thisTimeNewStock.getRealNum(),
|
||||
thisVehicleInTask.getOrigin() + ":入库",
|
||||
LocalDateTime.now(),
|
||||
thisVehicleInTask.getOpUser()
|
||||
);
|
||||
stockUpdateList.add(stockUpdate);
|
||||
} else {
|
||||
// 更新已有库存信息
|
||||
if (oldStockList.size() > 1) {
|
||||
|
|
@ -539,7 +579,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
.mapToInt(TAppStock::getTotalNum)
|
||||
.sum();
|
||||
// 新库存,增加库存信息
|
||||
newStockList.add(new TAppStock(
|
||||
TAppStock thisTimeOldNewStock = new TAppStock(
|
||||
UUIDUtils.getNewUUID(),
|
||||
vehicleId,
|
||||
thisVehicleInTask.getDestination(),
|
||||
|
|
@ -558,7 +598,21 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
sledDays,
|
||||
null,
|
||||
null
|
||||
));
|
||||
);
|
||||
newStockList.add(thisTimeOldNewStock);
|
||||
// 库存更新记录
|
||||
TAppStockUpdate stockUpdate = new TAppStockUpdate(
|
||||
UUIDUtils.getNewUUID(),
|
||||
thisTimeOldNewStock.getVehicleId(),
|
||||
thisTimeOldNewStock.getGoodsId(),
|
||||
thisTimeOldNewStock.getFirstInTime(),
|
||||
originSum,
|
||||
thisTimeOldNewStock.getRealNum(),
|
||||
thisVehicleInTask.getOrigin() + ":入库",
|
||||
LocalDateTime.now(),
|
||||
thisVehicleInTask.getOpUser()
|
||||
);
|
||||
stockUpdateList.add(stockUpdate);
|
||||
needDeleteStockIds.addAll(oldStockList.stream()
|
||||
.map(TAppStock::getStockId)
|
||||
.toList());
|
||||
|
|
@ -574,6 +628,19 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
oldStock.setLastUpdateUser(thisVehicleInTask.getOpUser());
|
||||
oldStock.setStockStatus(WmsStockStatusEnums.OK.getCode());
|
||||
newStockList.add(oldStock);
|
||||
// 库存更新记录
|
||||
TAppStockUpdate stockUpdate = new TAppStockUpdate(
|
||||
UUIDUtils.getNewUUID(),
|
||||
oldStock.getVehicleId(),
|
||||
oldStock.getGoodsId(),
|
||||
oldStock.getFirstInTime(),
|
||||
oldStock.getRealNum() - thisVehicleInTask.getOpNum(),
|
||||
oldStock.getRealNum(),
|
||||
thisVehicleInTask.getOrigin() + ":入库",
|
||||
LocalDateTime.now(),
|
||||
thisVehicleInTask.getOpUser()
|
||||
);
|
||||
stockUpdateList.add(stockUpdate);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -624,6 +691,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
|
|||
if (!newStockList.isEmpty()) {
|
||||
appStockService.saveOrUpdateBatch(newStockList);
|
||||
}
|
||||
// 增加库存更新记录
|
||||
if (!stockUpdateList.isEmpty()) {
|
||||
appStockUpdateService.saveBatch(stockUpdateList);
|
||||
}
|
||||
// 添加任务记录
|
||||
if (!newTaskBakList.isEmpty()) {
|
||||
appTaskBakService.saveBatch(newTaskBakList);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user