出库不减o库存问题修改;

This commit is contained in:
王奎兴
2026-05-29 14:20:03 +08:00
parent 7c000fda35
commit ba6b38d8c6
4 changed files with 23 additions and 4 deletions
@@ -126,16 +126,25 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl<ReservationMat
Long materialBaseInfoId = materialInventoryOmsParamDO.getMaterialBaseInfoId();
Long warehouseId = materialInventoryOmsParamDO.getWarehouseId();
LambdaQueryWrapper<ReservationMaterialInventory> param = new LambdaQueryWrapper<ReservationMaterialInventory>()
.eq(ReservationMaterialInventory::getInOrderNumber, inOrderNumber)
// .eq(ReservationMaterialInventory::getInOrderNumber, inOrderNumber)
//.eq(ReservationMaterialInventory::getLotNumber, lotNumber)
//.eq(ReservationMaterialInventory::getBatchNumber, batchNumber)
.eq(ReservationMaterialInventory::getMaterialBaseInfoId, materialBaseInfoId)
.eq(ReservationMaterialInventory::getWarehouseId, warehouseId);
if(inOrderNumber != null && !inOrderNumber.isEmpty()) {
param.eq(ReservationMaterialInventory::getInOrderNumber, inOrderNumber);
} else {
param.isNull(ReservationMaterialInventory::getInOrderNumber);
}
if(lotNumber != null && !lotNumber.isEmpty()) {
// param.eq(ReservationMaterialInventory::getLotNumber, lotNumber);
param.eq(ReservationMaterialInventory::getLotNumber, lotNumber);
} else {
param.isNull(ReservationMaterialInventory::getLotNumber);
}
if (batchNumber != null && !batchNumber.isEmpty()) {
// param.eq(ReservationMaterialInventory::getBatchNumber, batchNumber);
param.eq(ReservationMaterialInventory::getBatchNumber, batchNumber);
} else {
param.isNull(ReservationMaterialInventory::getBatchNumber);
}
List<ReservationMaterialInventory> reservationMaterialInventories = materialInventoryMapper.selectList(param);
if (reservationMaterialInventories != null && reservationMaterialInventories.size() > 0) {
@@ -215,6 +215,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
reservationStockOutOrderDO.setSalesmanId(loginUser.getUserPo().getUserId().toString());
reservationStockOutOrderDO.setSalesmanName(loginUser.getUserPo().getUserName());
reservationStockOutOrderDO.setCreateTime(new Date());
reservationStockOutOrderDO.setDocumentDate(new Date());
reservationStockOutOrderDO.setCreateBy(loginUser.getUserPo().getUserId());
reservationStockOutOrderDO.setCreateByName(loginUser.getUserPo().getUserName());
reservationStockOutOrderDO.setDelFlag(1);
@@ -347,6 +348,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
reservationStockInOrderDO.setDelFlag(1);
reservationStockInOrderDO.setDocumentCreator(loginUser.getUserPo().getUserId().toString());
reservationStockInOrderDO.setDocumentCreatorName(loginUser.getUserPo().getUserName());
reservationStockInOrderDO.setDocumentDate(new Date());
reservationStockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
reservationStockInOrderDO.setOrderTypeName("普通入库");
reservationStockInOrderDO.setIssueStatus(0);