From f9364cbaee8ba456e9651da8b1ff52ab1cc0bccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 1 Jun 2026 08:13:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(service):=20=E5=B0=86NoScanningBas?= =?UTF-8?q?eControllerService=E4=B8=AD=E7=9A=84=E6=96=B9=E6=B3=95=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E6=9D=83=E9=99=90=E4=BB=8Eprotected=E6=94=B9=E4=B8=BA?= =?UTF-8?q?public?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改existsQrCode方法的访问权限为public - 修改quantityConsistencyCheck方法的访问权限为public - 修改qrCodeCreateTask方法的访问权限为public - 保持原有业务逻辑不变，仅调整方法可见性以支持外部调用 --- .../wms/admin/service/NoScanningBaseControllerService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java index f4eb49a2..a478b4e4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NoScanningBaseControllerService.java @@ -24,7 +24,7 @@ public class NoScanningBaseControllerService { * @param materialNo 物料编号 * @return 是否生成过二维码 */ - protected boolean existsQrCode(String materialNo) { + public boolean existsQrCode(String materialNo) { return qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getMaterialCode, materialNo) .exists(); @@ -37,7 +37,7 @@ public class NoScanningBaseControllerService { * @param warehouseNo 仓库编号 * @return 数量是否一致 */ - protected boolean quantityConsistencyCheck(String materialNo, String factoryNo, String warehouseNo) { + public boolean quantityConsistencyCheck(String materialNo, String factoryNo, String warehouseNo) { BigDecimal quantityQr = qrCodeMasterService.lambdaQuery() .select(WmsQrCodeMaster::getQuantity) .eq(WmsQrCodeMaster::getMaterialCode, materialNo) @@ -66,7 +66,7 @@ public class NoScanningBaseControllerService { * @param factoryNo 工厂编号 * @param warehouseNo 仓库编号 */ - protected void qrCodeCreateTask(String materialNo,String factoryNo, String warehouseNo){ + public void qrCodeCreateTask(String materialNo,String factoryNo, String warehouseNo){ if (!quantityConsistencyCheck(materialNo, factoryNo, warehouseNo)) { //TODO 给仓库负责人创建补码的待办任务 } From 7d12cfdbaa4a89c1b12d806a5abc61026fc057f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 1 Jun 2026 08:34:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(request):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=97=A0=E6=89=AB=E6=8F=8F=E8=AF=B7=E6=B1=82=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 NoScanningItemDataRequest 类用于明细数据 - 修改 NoScanningItemRequest 结构，将数量、批次号等字段移至子类 - 将订单项ID改为物料编号，新增明细列表字段 - 调整 NoScanningRequest 中的字段定义，订单项ID改为库存地点编号 - 保留并验证明细列表的必填校验规则 - 优化请求对象的字段映射关系和验证注解配置 --- .../request/NoScanningItemDataRequest.java | 31 +++++++++++++++++++ .../pojo/request/NoScanningItemRequest.java | 24 +++++++------- .../admin/pojo/request/NoScanningRequest.java | 11 +++---- 3 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemDataRequest.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemDataRequest.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemDataRequest.java new file mode 100644 index 00000000..7f655d6d --- /dev/null +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemDataRequest.java @@ -0,0 +1,31 @@ +package com.nflg.wms.admin.pojo.request; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class NoScanningItemDataRequest { + + /** + * 数量 + */ + @NotNull + private BigDecimal num; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 库位 + */ + private String binNo; +} diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemRequest.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemRequest.java index d797b7b6..401443a9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemRequest.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningItemRequest.java @@ -1,31 +1,33 @@ package com.nflg.wms.admin.pojo.request; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; import java.math.BigDecimal; +import java.util.List; @Data public class NoScanningItemRequest { /** - * 数量 + * 订单项ID */ @NotNull - private BigDecimal num; + private Long orderItemId; /** - * 批次号 + * 物料编号 */ - private String batchNo; + @NotBlank + private String materialNo; /** - * 序列号 + * 明细列表 */ - private String serialNo; - - /** - * 库位 - */ - private String binNo; + @Valid + @NotEmpty + private List datas; } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningRequest.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningRequest.java index 22dde3d6..f966672d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningRequest.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/request/NoScanningRequest.java @@ -12,20 +12,17 @@ import java.util.List; public class NoScanningRequest { /** - * 订单项ID + * 订单id */ @NotNull - private Long orderItemId; + private Long id; /** - * 物料编号 + * 库存地点编号 */ @NotBlank - private String materialNo; + private String warehouseNo; - /** - * 明细列表 - */ @Valid @NotEmpty private List items;