DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wms): 优化仓库操作日志查询和钢卷库区绑定逻辑

Browse Source 
- 修改查询条件，当operationType和inOutType为空时不添加到查询条件中
- 简化钢卷库区变更的日志记录逻辑，移除-1置空的特殊处理分支
- 注释掉实际库区ID为-1时清空钢卷库区绑定的相关代码
- 移除加工操作中对-1值的特殊处理，统一入库操作逻辑
- 在合卷操作中增加对实际库区ID不等于-1的判断条件
This commit is contained in:
Joshi
2026-03-06 11:00:36 +08:00
parent 78a7bb4123
commit 7bb102a17f
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java
View File

@@ -136,8 +136,8 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
LambdaQueryWrapper<WmsCoilWarehouseOperationLog> lqw = Wrappers.lambdaQuery();
lqw.in(WmsCoilWarehouseOperationLog::getActualWarehouseId, warehouseIds);
lqw.eq(WmsCoilWarehouseOperationLog::getOperationType, operationType);
lqw.eq(WmsCoilWarehouseOperationLog::getInOutType, inOutType);
lqw.eq(operationType != null, WmsCoilWarehouseOperationLog::getOperationType, operationType);
lqw.eq(inOutType != null, WmsCoilWarehouseOperationLog::getInOutType, inOutType);
lqw.ge(startTime != null, WmsCoilWarehouseOperationLog::getCreateTime, startTime);
lqw.le(endTime != null, WmsCoilWarehouseOperationLog::getCreateTime, endTime);
lqw.orderByDesc(WmsCoilWarehouseOperationLog::getCreateTime);

38
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -1145,14 +1145,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
recordWarehouseOperationLog(bo.getCoilId(), oldActualWarehouseId, 3, 2, "简单更新-调拨出库");
}
// 如果前端传了新的（非-1表示入库，-1表示置空出库）
if (newActualWarehouseId != null) {
if (newActualWarehouseId == -1L) {
// 传-1置空，算出库
recordWarehouseOperationLog(bo.getCoilId(), oldActualWarehouseId, 3, 2, "简单更新-调拨出库");
} else {
// 有新库区，算入库
recordWarehouseOperationLog(bo.getCoilId(), newActualWarehouseId, 3, 1, "简单更新-调拨入库");
}
if (newActualWarehouseId != null && newActualWarehouseId != -1L) {
// 有新库区，算入库
recordWarehouseOperationLog(bo.getCoilId(), newActualWarehouseId, 3, 1, "简单更新-调拨入库");
}
}
@@ -1199,10 +1194,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
newCoil.setDataType(1); // 设置为当前数据
newCoil.setQrcodeRecordId(oldCoil.getQrcodeRecordId()); // 继续使用原二维码
// 如果实际库区id为-1，则清空钢卷上的实际库区绑定
if (bo.getActualWarehouseId() != null && bo.getActualWarehouseId().equals(-1L)) {
clearActualWarehouseBinding(oldCoil.getActualWarehouseId(), bo.getCoilId());
}
// // 如果实际库区id为-1，则清空钢卷上的实际库区绑定
// if (bo.getActualWarehouseId() != null && bo.getActualWarehouseId().equals(-1L)) {
// clearActualWarehouseBinding(oldCoil.getActualWarehouseId(), bo.getCoilId());
// }
// 继承原记录的关键字段
if (newCoil.getEnterCoilNo() == null) {
@@ -1237,22 +1232,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 就算老的和新的实际库区相等也应该建两条，因为钢卷ID不一样
Long oldActualWarehouseId = oldCoil.getActualWarehouseId();
Long newActualWarehouseId = bo.getActualWarehouseId();
// 老的实际库区存在，加一条加工出库记录
if (oldActualWarehouseId != null && oldActualWarehouseId != -1L) {
recordWarehouseOperationLog(oldCoil.getCoilId(), oldActualWarehouseId, 2, 2, "单个更新-加工出库");
}
// 新的实际库区存在，加一条加工入库记录（传-1置空时算出库）
if (newActualWarehouseId != null) {
if (newActualWarehouseId == -1L) {
// 传-1置空，算出库（使用老钢卷ID和老的库区）
if (oldActualWarehouseId != null && oldActualWarehouseId != -1L) {
recordWarehouseOperationLog(oldCoil.getCoilId(), oldActualWarehouseId, 2, 2, "单个更新-加工出库");
}
} else {
// 有新库区，算入库
recordWarehouseOperationLog(newCoil.getCoilId(), newActualWarehouseId, 2, 1, "单个更新-加工入库");
}
// 新的实际库区存在，加一条加工入库记录
if (newActualWarehouseId != null && newActualWarehouseId != -1L) {
// 有新库区，算入库
recordWarehouseOperationLog(newCoil.getCoilId(), newActualWarehouseId, 2, 1, "单个更新-加工入库");
}
}
@@ -1594,7 +1582,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
for (WmsMaterialCoilBo originalCoilBo : bo.getNewCoils()) {
if (originalCoilBo.getCoilId() != null) {
WmsMaterialCoil originalCoil = baseMapper.selectById(originalCoilBo.getCoilId());
if (originalCoil != null && originalCoil.getActualWarehouseId() != null
if (originalCoil != null && originalCoil.getActualWarehouseId() != null
&& originalCoil.getActualWarehouseId() != -1L) {
recordWarehouseOperationLog(originalCoil.getCoilId(), originalCoil.getActualWarehouseId(), 2, 2, "合卷操作-加工出库");
}