fix(transfer): 解决已完成订单仍返回扫描项目的问题
- 在 TransferCompanyController 中添加订单完成状态检查 - 在 TransferFactoryController 中添加订单完成状态检查 - 完成订单直接返回空列表避免继续处理 - 移除冗余的数量零值判断逻辑 - 优化二维码扫描状态过滤条件
This commit is contained in:
parent
77037e9a9f
commit
40f8914bd5
|
|
@ -967,9 +967,11 @@ public class TransferCompanyController extends BaseController {
|
|||
, @RequestParam(required = false) String no) {
|
||||
TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(orderId, no);
|
||||
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("订单不存在");
|
||||
if (ticket.getFinish()){
|
||||
return ApiResult.success(Collections.emptyList());
|
||||
}
|
||||
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.getId());
|
||||
items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0
|
||||
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
|
||||
items.removeIf(item -> noScanningBaseControllerService.existsQrCode(item.getMatnr()));
|
||||
return ApiResult.success(
|
||||
items.stream()
|
||||
.map(item -> new NoScanItemVO()
|
||||
|
|
|
|||
|
|
@ -940,9 +940,11 @@ public class TransferFactoryController extends BaseController {
|
|||
, @RequestParam(required = false) String no) {
|
||||
TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no);
|
||||
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
|
||||
if (order.getFinish()){
|
||||
return ApiResult.success(Collections.emptyList());
|
||||
}
|
||||
List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(order.getId());
|
||||
items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0
|
||||
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
|
||||
items.removeIf(item -> noScanningBaseControllerService.existsQrCode(item.getMatnr()));
|
||||
return ApiResult.success(
|
||||
items.stream()
|
||||
.map(item -> new NoScanItemVO()
|
||||
|
|
|
|||
Loading…
Reference in New Issue