From 2f614248bb24d520eaba74b0d00abaa73c442524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 1 Apr 2026 19:17:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor(controller):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=92=8C=E6=9C=8D=E5=8A=A1=E5=B1=82=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除未使用的 SrmMaterialReceiptScanCodesRepository 注入 - 修复变量名拼写错误 srmMaterialReceiptCanCodesRepository 替换为 srmMaterialReceiptScanCodesRepository - 将核心业务逻辑抽取到独立的 NormalPGIControllerService 类中 - 删除未使用的 StringUtil 导入并优化代码格式 - 修复包装类型比较运算符的空格问题 - 优化批量操作的集合处理逻辑 - 移除过时的注释标记和冗余的验证注解 --- .../wms/admin/controller/NormalPGIController.java | 6 +++--- .../wms/admin/controller/QrCodeMasterController.java | 12 +++++------- .../admin/service/NormalPGIControllerService.java | 1 - .../com/nflg/wms/common/pojo/qo/StrappingAddQO.java | 3 --- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 6e3b74f7..62fd08da 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -72,8 +72,8 @@ public class NormalPGIController extends BaseController { @Resource private NormalPGIControllerService normalPGIControllerService; - @Resource - private SrmMaterialReceiptScanCodesRepository srmMaterialReceiptCanCodesRepository; +// @Resource +// private SrmMaterialReceiptScanCodesRepository srmMaterialReceiptCanCodesRepository; @Resource private SAPCommonService sapCommonService; @@ -165,7 +165,7 @@ public class NormalPGIController extends BaseController { @GetMapping("getScanCodes") @ApiMark(moduleName = "送货单管理", apiName = "获取扫码的详情信息") public ApiResult> getScanCodes(@RequestParam Long orderItemId) { - List scanCodes = srmMaterialReceiptCanCodesRepository.findByOrderItemId(orderItemId); + List scanCodes = srmMaterialReceiptScanCodesRepository.findByOrderItemId(orderItemId); List pdas = Convert.toList(PDAScanCodeVO.class, scanCodes); return ApiResult.success(pdas); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java index 202b778d..627018db 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java @@ -20,7 +20,6 @@ import com.nflg.wms.common.pojo.vo.QrCodeItemVO; import com.nflg.wms.common.pojo.vo.QrCodeVO; import com.nflg.wms.common.pojo.vo.StrappingVO; import com.nflg.wms.common.util.NumberUtil; -import com.nflg.wms.common.util.StringUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.WmsPackageItem; @@ -97,7 +96,7 @@ public class QrCodeMasterController extends BaseController { .eq(WmsQrCodeMaster::getBarcodeCode, request.getBarcodeCode()) .one(); VUtil.trueThrowBusinessError(ObjectUtil.isNull(qrCodeMaster)).throwMessage("无效码"); - VUtil.trueThrowBusinessError(qrCodeMaster.getPackagingType()!=1).throwMessage("此码不属于箱码"); + VUtil.trueThrowBusinessError(qrCodeMaster.getPackagingType() != 1).throwMessage("此码不属于箱码"); VUtil.trueThrowBusinessError(qrCodeMaster.getProcessStage() != BarCodeProcessStage.Unpackaged.getState()) .throwMessage("此箱码已处于【" + BarCodeProcessStage.findByValue(qrCodeMaster.getProcessStage()).getDescription() + "】状态，不可以操作"); List smallQrCodeMasters = qrCodeMasterService.lambdaQuery() @@ -226,7 +225,7 @@ public class QrCodeMasterController extends BaseController { } } VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(differentBatchNos)) - .throwMessage("批次号不一致，不一致的物料条码号为：" + differentBatchNos); + .throwMessage("批次号不一致，不一致的物料条码号为：" + StrUtil.join(",",differentBatchNos)); // 判断箱子的物料信息是否OK smallBarcodeValidation(qrCodeMaster, smallQrCodeMasters, BarCodeProcessStage.Packaged); @@ -382,11 +381,10 @@ public class QrCodeMasterController extends BaseController { /** * 物料出入库统一扫码接口 - * * @param request - * @return - * @author - * */ + * @return + * @author + **/ @PostMapping("pda/scan") @ApiMark(moduleName = "扫码", apiName = "扫码获取扫码信息") public ApiResult scan(@Valid @RequestBody QRCodeSearchQO request) { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java index c02ca650..5984b517 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java @@ -9,7 +9,6 @@ import com.nflg.wms.admin.pojo.dto.QCMaterialSyncDTO; import com.nflg.wms.admin.pojo.dto.ZWM3A17DTO; import com.nflg.wms.admin.repository.SrmMaterialReceiptNoScanCodesRepository; import com.nflg.wms.admin.repository.SrmMaterialReceiptScanCodesRepository; -import com.nflg.wms.common.constant.BarCodeProcessStage; import com.nflg.wms.common.pojo.document.SrmMaterialReceiptNoScanCodes; import com.nflg.wms.common.pojo.document.SrmMaterialReceiptScanCodes; import com.nflg.wms.common.pojo.dto.*; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StrappingAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StrappingAddQO.java index bfab1878..22714f6a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StrappingAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StrappingAddQO.java @@ -2,7 +2,6 @@ package com.nflg.wms.common.pojo.qo; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,6 @@ public class StrappingAddQO { /** * 待装箱的二维码编号 */ - @NotNull @NotBlank private String barcodeCode; @@ -36,7 +34,6 @@ public class StrappingAddQO { /** * 待换箱的物料二维码 */ - @NotNull @NotEmpty private List items; }