From a4878dee0b9cfab78ddbdb1d61237733f0f8ccce Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Tue, 28 Apr 2026 11:20:52 +0800 Subject: [PATCH] =?UTF-8?q?pdi=E6=A3=80=E9=AA=8C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=88=E6=89=80=E5=B1=9E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=EF=BC=89=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ExternalPdiTaskRecordControllerService.java | 8 ++++++++ .../nflg/wms/common/pojo/qo/QmsPdiTaskRecordAddQO.java | 5 +++++ .../common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java | 5 +++++ .../nflg/wms/common/pojo/qo/QmsPdiTaskRecordSearchQO.java | 5 +++++ .../wms/common/pojo/vo/QmsPdiTaskRecordDefectPageVO.java | 5 +++++ .../nflg/wms/common/pojo/vo/QmsPdiTaskRecordPageVO.java | 5 +++++ .../com/nflg/wms/repository/entity/QmsPdiTaskRecord.java | 5 +++++ .../src/main/resources/mapper/QmsPdiTaskRecordMapper.xml | 8 ++++++++ 8 files changed, 46 insertions(+) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/ExternalPdiTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/ExternalPdiTaskRecordControllerService.java index e3738e57..6e053df9 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/ExternalPdiTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/ExternalPdiTaskRecordControllerService.java @@ -65,6 +65,13 @@ public class ExternalPdiTaskRecordControllerService { throw new NflgException(STATE.BusinessError, "PDI检测规则未发布，无法创建检测任务"); } + // 库存检测（inspectionType=1）时，仓库编号必传 + if (Objects.equals(rule.getInspectionType(), 1)) { + if (request.getWarehouseNo() == null || request.getWarehouseNo().isBlank()) { + throw new NflgException(STATE.BusinessError, "库存检测时仓库编号不能为空"); + } + } + LocalDateTime submissionTime = LocalDateTime.now(); LocalDateTime requiredCompletionTime = submissionTime.plusDays( rule.getInspectionCycle() != null ? rule.getInspectionCycle() : 0 @@ -77,6 +84,7 @@ public class ExternalPdiTaskRecordControllerService { .setDeviceNo(request.getDeviceNo()) .setOrderNo(request.getOrderNo()) .setFactoryNo(request.getFactoryNo()) + .setWarehouseNo(request.getWarehouseNo()) .setInspectionEnable(0) .setSubmissionTime(submissionTime) .setRequiredCompletionTime(requiredCompletionTime); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordAddQO.java index c45a0776..86622bb6 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordAddQO.java @@ -39,4 +39,9 @@ public class QmsPdiTaskRecordAddQO { */ @NotBlank(message = "工厂编号不能为空") private String factoryNo; + + /** + * 仓库编号（可选，inspectionType=1库存检测时必传） + */ + private String warehouseNo; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java index 7b47b99e..c9b1b898 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordDefectSearchQO.java @@ -33,6 +33,11 @@ public class QmsPdiTaskRecordDefectSearchQO { */ private String factoryNo; + /** + * 仓库编号（可选） + */ + private String warehouseNo; + /** * 检验类型（可选）：0=新机检测，1=库存检测 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordSearchQO.java index f7e886ae..3b0a6924 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiTaskRecordSearchQO.java @@ -39,6 +39,11 @@ public class QmsPdiTaskRecordSearchQO { */ private String factoryNo; + /** + * 仓库编号（可选） + */ + private String warehouseNo; + /** * 检验类型（必传）：0=静态，1=动态，2=特殊 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDefectPageVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDefectPageVO.java index b8ef5fe1..3bba32aa 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDefectPageVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordDefectPageVO.java @@ -35,6 +35,11 @@ public class QmsPdiTaskRecordDefectPageVO { */ private String factoryNo; + /** + * 仓库编号 + */ + private String warehouseNo; + /** * 质检类型（来自检测规则）：0=新机检测，1=库存检测 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordPageVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordPageVO.java index fdcffd93..60f78b60 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordPageVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTaskRecordPageVO.java @@ -35,6 +35,11 @@ public class QmsPdiTaskRecordPageVO { */ private String factoryNo; + /** + * 仓库编号 + */ + private String warehouseNo; + /** * 质检类型（来自检测规则） */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiTaskRecord.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiTaskRecord.java index baa4536d..362d9132 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiTaskRecord.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPdiTaskRecord.java @@ -86,4 +86,9 @@ public class QmsPdiTaskRecord implements Serializable { * 订单编号 */ private String orderNo; + + /** + * 仓库编号 + */ + private String warehouseNo; } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml index 05b4cc3d..3a04bb88 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsPdiTaskRecordMapper.xml @@ -9,6 +9,7 @@ t.device_no AS deviceNo, t.order_no AS orderNo, t.factory_no AS factoryNo, + t.warehouse_no AS warehouseNo, r.inspection_type AS inspectionType, r.inspection_version AS inspectionVersion, r.machine_no AS machineNo, @@ -47,6 +48,9 @@ AND t.factory_no = #{request.factoryNo} + + AND t.warehouse_no = #{request.warehouseNo} + AND ( t.inspection_enable IN (0, 1) @@ -73,6 +77,7 @@ t.device_no AS deviceNo, t.order_no AS orderNo, t.factory_no AS factoryNo, + t.warehouse_no AS warehouseNo, r.inspection_type AS inspectionType, r.inspection_version AS inspectionVersion, r.machine_no AS machineNo, @@ -119,6 +124,9 @@ AND t.factory_no = #{request.factoryNo} + + AND t.warehouse_no = #{request.warehouseNo} + AND it.status = #{request.status}