From 80c6818d2017982c5a05fe87cb195012b1bef2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 4 Jun 2026 15:09:23 +0800 Subject: [PATCH] =?UTF-8?q?style(controller):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=92=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A4=E6=96=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复了方法调用中的空格格式问题 - 将 finish 字段判断改为 state 状态值判断 - 优化了参数传递中的空格格式 - 统一了 short 类型转换的格式化样式 --- .../admin/controller/TransferCompanyController.java | 10 +++++----- .../admin/controller/TransferFactoryController.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index fa6b6c0b..6368c158 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -507,7 +507,7 @@ public class TransferCompanyController extends BaseController { .eq(WmsTransferCompanyItem::getOrderId, order.getId()) .list(); items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0 - || noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(),order.getReswk(),item.getLgpro())); + || noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(), order.getReswk(), item.getLgpro())); return ApiResult.success( items.stream() .map(item -> new NoScanItemVO() @@ -641,7 +641,7 @@ public class TransferCompanyController extends BaseController { ).toList() ); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1) + optRecordDTO.setOperationType((short) 1) .setOrderId(order.getNo()); optRecordService.add(optRecordDTO); ZWM00_MB116VO vo = sapService.zwm00_mb116(new ZWM00_MB116QO() @@ -914,7 +914,7 @@ public class TransferCompanyController extends BaseController { ); inMaterialScanRecordRespository.saveAll(records); OptRecordDTO optRecordDTO = new OptRecordDTO(); - optRecordDTO.setOperationType((short)1) + optRecordDTO.setOperationType((short) 1) .setOrderId(ticket.getTicketNo()); optRecordService.add(optRecordDTO); Pair, Pair> vos = sapService.zwm3a17(new ZWM3A17DTO() @@ -967,7 +967,7 @@ 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()){ + if (ticket.getState() == 1) { return ApiResult.success(Collections.emptyList()); } List items = transferCompanyTicketItemService.getList(ticket.getId()); @@ -993,7 +993,7 @@ public class TransferCompanyController extends BaseController { @Transactional @PostMapping("pda/submitForInNoScanning") public ApiResult submitForInNoScanning(@Valid @RequestBody NoScanningRequest request) { - TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId(),request.getNo()); + TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId(), request.getNo()); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在"); VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效"); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index 9f8747a6..8a8069d2 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -533,7 +533,7 @@ public class TransferFactoryController extends BaseController { .eq(WmsTransferFactoryItem::getOrderId, order.getId()) .list(); items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0 - || noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(),order.getWerks(),order.getLgort())); + || noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(), order.getWerks(), order.getLgort())); return ApiResult.success( items.stream() .map(item -> new NoScanItemVO() @@ -940,7 +940,7 @@ 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()){ + if (order.getState() == 1) { return ApiResult.success(Collections.emptyList()); } List items = transferFactoryTicketItemService.getList(order.getId()); @@ -966,7 +966,7 @@ public class TransferFactoryController extends BaseController { @Transactional @PostMapping("pda/submitForInNoScanning") public ApiResult submitForInNoScanning(@Valid @RequestBody @NotNull NoScanningRequest request) { - TransferFactoryTicketInfoVO ticket = transferFactoryTicketService.getInfo(request.getId(),request.getNo()); + TransferFactoryTicketInfoVO ticket = transferFactoryTicketService.getInfo(request.getId(), request.getNo()); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在"); VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效"); List ticketItems = transferFactoryTicketItemService.getList(ticket.getId());