逻辑删除查询条件;
This commit is contained in:
+7
-3
@@ -1005,7 +1005,8 @@ public class StockOutOrderApplicationService {
|
|||||||
}
|
}
|
||||||
BeanUtils.copyProperties(stockOutOrderDb, stockOutOrderD);
|
BeanUtils.copyProperties(stockOutOrderDb, stockOutOrderD);
|
||||||
List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper<OutMaterialDetail>().lambda()
|
List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper<OutMaterialDetail>().lambda()
|
||||||
.eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber()));
|
.eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber())
|
||||||
|
.eq(OutMaterialDetail::getDelFlag,1));
|
||||||
List<OutMaterialDetailDO> materialDetailList = cn.hutool.core.bean.BeanUtil.copyToList(outMaterialDetailList, OutMaterialDetailDO.class);
|
List<OutMaterialDetailDO> materialDetailList = cn.hutool.core.bean.BeanUtil.copyToList(outMaterialDetailList, OutMaterialDetailDO.class);
|
||||||
List<OutMaterialDetailDO> materialDetailList2 = new ArrayList<>();
|
List<OutMaterialDetailDO> materialDetailList2 = new ArrayList<>();
|
||||||
// 仅通宇账号启用与库存分配弹窗同口径的新匹配(物料+箱号/卡板+Sheet Ref 多值拆 token);
|
// 仅通宇账号启用与库存分配弹窗同口径的新匹配(物料+箱号/卡板+Sheet Ref 多值拆 token);
|
||||||
@@ -1103,7 +1104,8 @@ public class StockOutOrderApplicationService {
|
|||||||
}
|
}
|
||||||
BeanUtils.copyProperties(stockOutOrderDb, stockOutOrderD);
|
BeanUtils.copyProperties(stockOutOrderDb, stockOutOrderD);
|
||||||
List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper<OutMaterialDetail>().lambda()
|
List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper<OutMaterialDetail>().lambda()
|
||||||
.eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber()));
|
.eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber())
|
||||||
|
.eq(OutMaterialDetail::getDelFlag, 1));
|
||||||
List<OutMaterialDetailDO> materialDetailList = cn.hutool.core.bean.BeanUtil.copyToList(outMaterialDetailList, OutMaterialDetailDO.class);
|
List<OutMaterialDetailDO> materialDetailList = cn.hutool.core.bean.BeanUtil.copyToList(outMaterialDetailList, OutMaterialDetailDO.class);
|
||||||
List<OutMaterialDetailDO> materialDetailList2 = new ArrayList<>();
|
List<OutMaterialDetailDO> materialDetailList2 = new ArrayList<>();
|
||||||
for (OutMaterialDetailDO detail : materialDetailList) {
|
for (OutMaterialDetailDO detail : materialDetailList) {
|
||||||
@@ -1441,7 +1443,9 @@ public class StockOutOrderApplicationService {
|
|||||||
List<OutMaterialDetailDO> returnOutMaterialDetailDOList = new ArrayList<>();
|
List<OutMaterialDetailDO> returnOutMaterialDetailDOList = new ArrayList<>();
|
||||||
for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()){
|
for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()){
|
||||||
Long uniqueId = outMaterialDetailDO.getUniqueId();
|
Long uniqueId = outMaterialDetailDO.getUniqueId();
|
||||||
OutMaterialDetail outMaterialDetail = outMaterialDetailService.getOne(new LambdaQueryWrapper<OutMaterialDetail>().eq(OutMaterialDetail::getUniqueId, uniqueId));
|
OutMaterialDetail outMaterialDetail = outMaterialDetailService.getOne(new LambdaQueryWrapper<OutMaterialDetail>()
|
||||||
|
.eq(OutMaterialDetail::getUniqueId, uniqueId)
|
||||||
|
.eq(OutMaterialDetail::getDelFlag,1));
|
||||||
if (outMaterialDetail == null){
|
if (outMaterialDetail == null){
|
||||||
throw new ServiceException("出库明细不存在");
|
throw new ServiceException("出库明细不存在");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user