rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(transfer): 解决已完成订单仍返回扫描项目的问题 

- 在 TransferCompanyController 中添加订单完成状态检查
- 在 TransferFactoryController 中添加订单完成状态检查
- 完成订单直接返回空列表避免继续处理
- 移除冗余的数量零值判断逻辑
- 优化二维码扫描状态过滤条件
This commit is contained in:
曹鹏飞 2026-06-04 14:21:55 +08:00
parent 77037e9a9f
commit 40f8914bd5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -967,9 +967,11 @@ public class TransferCompanyController extends BaseController {
, @RequestParam(required = false) String no) { , @RequestParam(required = false) String no) {
TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(orderId, no); TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(orderId, no);
VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("订单不存在"); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("订单不存在");
if (ticket.getFinish()){
return ApiResult.success(Collections.emptyList());
}
List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.getId()); List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.getId());
items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0 items.removeIf(item -> noScanningBaseControllerService.existsQrCode(item.getMatnr()));
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
return ApiResult.success( return ApiResult.success(
items.stream() items.stream()
.map(item -> new NoScanItemVO() .map(item -> new NoScanItemVO()

6
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -940,9 +940,11 @@ public class TransferFactoryController extends BaseController {
, @RequestParam(required = false) String no) { , @RequestParam(required = false) String no) {
TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no); TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no);
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
if (order.getFinish()){
return ApiResult.success(Collections.emptyList());
}
List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(order.getId()); List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(order.getId());
items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0 items.removeIf(item -> noScanningBaseControllerService.existsQrCode(item.getMatnr()));
|| noScanningBaseControllerService.existsQrCode(item.getMatnr()));
return ApiResult.success( return ApiResult.success(
items.stream() items.stream()
.map(item -> new NoScanItemVO() .map(item -> new NoScanItemVO()