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 b8115c5c..d4ddb207 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,7 +187,7 @@ public class IncomingInspectionTaskControllerService { // 7. 构建并保存来料检测任务 QmsIncomingInspectionTask task = new QmsIncomingInspectionTask() - .setCheckNo(request.getCheckNo()) + .setRequestNo(request.getRequestNo()) .setTaskNo(taskNo) .setMaterialId(material.getId()) .setInspectionStandardId(standard.getId()) @@ -312,7 +312,7 @@ public class IncomingInspectionTaskControllerService { // 7. 构建并保存库存检测任务(存入来料检测任务表,dataType=1) QmsIncomingInspectionTask task = new QmsIncomingInspectionTask() - .setCheckNo(request.getCheckNo()) + .setRequestNo(request.getRequestNo()) .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 3371dc36..73c69eb9 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,8 +104,7 @@ public class WmsIncomingInspectionTaskCallbackService { private void inventory(QmsIncomingInspectionTaskVO taskVO, Short processingResult) { WmsInventoryInspectionTaskCallbackQO qo = new WmsInventoryInspectionTaskCallbackQO() .setTaskNo(taskVO.getTaskNo()) - .setCheckNo(taskVO.getCheckNo()) - .setCheckNo(taskVO.getCheckNo()) + .setRequestNo(taskVO.getRequestNo()) .setMaterialNo(taskVO.getMaterialNo()) .setFactory(taskVO.getFactory()) .setWarehouse(taskVO.getWarehouse()) 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 136cc2dc..94fb8be6 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 @@ -12,10 +12,10 @@ import lombok.Data; public class ExternalIncomingInspectionApplyQO { /** - * 检验单号,第三方唯一编号 + * 请求单号,第三方唯一编号 */ - @NotBlank(message = "检验单号不能为空") - private String checkNo; + @NotBlank(message = "请求单号不能为空") + private String requestNo; /** * 物料编号(必填) 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 35008f96..5b1bc142 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 @@ -12,10 +12,10 @@ import lombok.Data; public class ExternalInventoryInspectionApplyQO { /** - * 检验单号,第三方唯一编号 + * 请求单号,第三方唯一编号 */ - @NotBlank(message = "检验单号不能为空") - private String checkNo; + @NotBlank(message = "请求单号不能为空") + private String requestNo; /** * 物料编号(必填) 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 726d77ea..54e83b3e 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 @@ -16,9 +16,9 @@ public class WmsInventoryInspectionTaskCallbackQO { private String taskNo; /** - * 检验单号,第三方唯一编号 + * 请求单号,第三方唯一编号 */ - private String checkNo; + private String requestNo; /** * 物料编号 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 6ee34fd8..603d2e75 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 @@ -18,9 +18,9 @@ public class QmsIncomingInspectionTaskVO { private String taskNo; /** - * 检验单号,第三方唯一编号 + * 请求单号,第三方唯一编号 */ - private String checkNo; + private String requestNo; /** * 物料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 202c555b..23e05aa2 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 @@ -38,9 +38,9 @@ public class QmsIncomingInspectionTask implements Serializable { private String taskNo; /** - * 检验单号,第三方唯一编号 + * 请求单号,第三方唯一编号 */ - private String checkNo; + private String requestNo; /** * 物料id,关联质检物料表