diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index 01a9b8dd..b8115c5c 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -187,6 +187,7 @@ public class IncomingInspectionTaskControllerService { // 7. 构建并保存来料检测任务 QmsIncomingInspectionTask task = new QmsIncomingInspectionTask() + .setCheckNo(request.getCheckNo()) .setTaskNo(taskNo) .setMaterialId(material.getId()) .setInspectionStandardId(standard.getId()) @@ -311,6 +312,7 @@ public class IncomingInspectionTaskControllerService { // 7. 构建并保存库存检测任务(存入来料检测任务表,dataType=1) QmsIncomingInspectionTask task = new QmsIncomingInspectionTask() + .setCheckNo(request.getCheckNo()) .setTaskNo(taskNo) .setMaterialId(material.getId()) .setInspectionStandardId(standard.getId()) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java index ba4928ce..3371dc36 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java @@ -104,12 +104,14 @@ public class WmsIncomingInspectionTaskCallbackService { private void inventory(QmsIncomingInspectionTaskVO taskVO, Short processingResult) { WmsInventoryInspectionTaskCallbackQO qo = new WmsInventoryInspectionTaskCallbackQO() .setTaskNo(taskVO.getTaskNo()) + .setCheckNo(taskVO.getCheckNo()) + .setCheckNo(taskVO.getCheckNo()) .setMaterialNo(taskVO.getMaterialNo()) .setFactory(taskVO.getFactory()) .setWarehouse(taskVO.getWarehouse()) .setStorageLocation(taskVO.getStorageLocation()) .setStorageDays(taskVO.getStorageDays()) - .setInspectionQty(taskVO.getInspectionQty()) + .setDetectionQty(taskVO.getDetectionQty()) .setQualifiedQty(taskVO.getQualifiedQty()) .setUnqualifiedQty(taskVO.getUnqualifiedQty()) .setInspectionResult(taskVO.getInspectionResult()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java index 5fa62a89..136cc2dc 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java @@ -11,6 +11,12 @@ import lombok.Data; @Data public class ExternalIncomingInspectionApplyQO { + /** + * 检验单号,第三方唯一编号 + */ + @NotBlank(message = "检验单号不能为空") + private String checkNo; + /** * 物料编号(必填) */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java index 672a609c..35008f96 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java @@ -11,6 +11,12 @@ import lombok.Data; @Data public class ExternalInventoryInspectionApplyQO { + /** + * 检验单号,第三方唯一编号 + */ + @NotBlank(message = "检验单号不能为空") + private String checkNo; + /** * 物料编号(必填) */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java index 1602fdda..726d77ea 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.experimental.Accessors; @@ -14,6 +15,11 @@ public class WmsInventoryInspectionTaskCallbackQO { */ private String taskNo; + /** + * 检验单号,第三方唯一编号 + */ + private String checkNo; + /** * 物料编号 */ @@ -40,9 +46,9 @@ public class WmsInventoryInspectionTaskCallbackQO { private Integer storageDays; /** - * 送检数量 + * 检测数量 */ - private Integer inspectionQty; + private Integer detectionQty; /** * 合格数量 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java index 02310182..6ee34fd8 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java @@ -17,6 +17,11 @@ public class QmsIncomingInspectionTaskVO { */ private String taskNo; + /** + * 检验单号,第三方唯一编号 + */ + private String checkNo; + /** * 物料id */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java index 709a9297..202c555b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java @@ -37,6 +37,11 @@ public class QmsIncomingInspectionTask implements Serializable { */ private String taskNo; + /** + * 检验单号,第三方唯一编号 + */ + private String checkNo; + /** * 物料id,关联质检物料表 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java index 70cbe507..e7bfcf83 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java @@ -50,7 +50,9 @@ public class DepartmentServiceImpl extends ServiceImpl SELECT t.id, t.task_no, + t.check_no, t.material_id, m.material_no, m.material_desc,