refactor(controller): 重构控制器代码结构和服务层实现

- 移除未使用的 SrmMaterialReceiptScanCodesRepository 注入
- 修复变量名拼写错误 srmMaterialReceiptCanCodesRepository 替换为 srmMaterialReceiptScanCodesRepository
- 将核心业务逻辑抽取到独立的 NormalPGIControllerService 类中
- 删除未使用的 StringUtil 导入并优化代码格式
- 修复包装类型比较运算符的空格问题
- 优化批量操作的集合处理逻辑
- 移除过时的注释标记和冗余的验证注解

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<List<PDAScanCodeVO>> getScanCodes(@RequestParam Long orderItemId) {
-        List<SrmMaterialReceiptScanCodes> scanCodes = srmMaterialReceiptCanCodesRepository.findByOrderItemId(orderItemId);
+        List<SrmMaterialReceiptScanCodes> scanCodes = srmMaterialReceiptScanCodesRepository.findByOrderItemId(orderItemId);
         List<PDAScanCodeVO> pdas = Convert.toList(PDAScanCodeVO.class, scanCodes);
         return ApiResult.success(pdas);
     }

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<WmsQrCodeMaster> 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<QrCodeVO> scan(@Valid @RequestBody QRCodeSearchQO request) {

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.*;

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<String> items;
 }