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 36d7ad52..f2a6290f 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 @@ -492,13 +492,13 @@ public class IncomingInspectionTaskControllerService { .setStorageDays(task.getStorageDays()) .setInspectionType(task.getInspectionType()) .setDataType(task.getDataType()) - .setInspectionQty(task.getInspectionQty()) + .setInspectionQty(task.getUnqualifiedQty()) .setInspectionStatus((short) 0) .setInspectorId(task.getInspectorId()) .setInspectorName(task.getInspectorName()) .setSubmitTime(LocalDateTime.now()) .setRequiredFinishTime(requiredFinishTime) - .setDetectionQty(task.getInspectionQty()); + .setDetectionQty(task.getUnqualifiedQty()); incomingInspectionTaskService.save(newTask); List qrs = incomingInspectionTaskQrService.lambdaQuery().eq(QmsIncomingInspectionTaskQr::getTaskId, taskId).list(); diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index 3f141310..fec01ad9 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -2990,7 +2990,7 @@ public class QmsIssueTicketControllerService { /** * 转换审批状态为文本 - * @param status 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用 + * @param status 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让步接收 * @return 状态文本 */ private String convertApprovalStatus(Short status) { @@ -3011,7 +3011,7 @@ public class QmsIssueTicketControllerService { case 5: return "挑选使用"; case 6: - return "让渡使用"; + return "让步接收"; default: return "未知"; } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReportControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReportControllerService.java index af343d6f..1332f203 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReportControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReportControllerService.java @@ -994,7 +994,7 @@ public class QmsReportControllerService { approvalNames.put((short) 3, "报废"); approvalNames.put((short) 4, "维修"); approvalNames.put((short) 5, "挑选使用"); - approvalNames.put((short) 6, "让渡使用"); + approvalNames.put((short) 6, "让步接收"); List result = new ArrayList<>(); for (Map.Entry entry : approvalNames.entrySet()) { 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 fd79c3ee..371be047 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 @@ -175,7 +175,7 @@ public class WmsIncomingInspectionTaskCallbackService { /** * WMS系统来料检验任务回调 * @param taskId 来料检验任务ID - * @param processingResult 处理结果:0=通过,3=报废,4=维修,5=挑选使用,6=让渡使用 + * @param processingResult 处理结果:0=通过,3=报废,4=维修,5=挑选使用,6=让步接收 */ @Async("wmsCallbackExecutor") public void processAsync(Long taskId, Short processingResult) { @@ -226,7 +226,7 @@ public class WmsIncomingInspectionTaskCallbackService { /** * WMS系统来料检验任务回调 * @param taskId 来料检验任务ID - * @param processingResult 处理结果:0=通过,3=报废,4=维修,5=挑选使用,6=让渡使用 + * @param processingResult 处理结果:0=通过,3=报废,4=维修,5=挑选使用,6=让步接收 */ private void process(Long taskId, Short processingResult) { QmsIncomingInspectionTaskVO taskVO = incomingInspectionTaskService.getDetail(taskId); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java index 06bf7d9d..acdfbb20 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java @@ -246,6 +246,8 @@ public class InCostCenterBackController extends BaseController { @Transactional @PostMapping("noScanSubmit") public ApiResult noScanSubmit(@Valid @RequestBody @NotNull NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); request.getItems() .forEach(data -> VUtil.trueThrowBusinessError(noScanningBaseControllerService.existsQrCode(data.getMaterialNo())) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java index ed30ca12..2cae9f1c 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java @@ -254,6 +254,8 @@ public class InProduceBackController extends BaseController { @Transactional @PostMapping("noScanSubmit") public ApiResult noScanSubmit(@Valid @RequestBody @NotNull NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); request.getItems() .forEach(data -> VUtil.trueThrowBusinessError(noScanningBaseControllerService.existsQrCode(data.getMaterialNo())) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index aa9fac29..c07bd0a9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -463,6 +463,8 @@ public class InProduceOrderController extends BaseController { @Transactional @PostMapping("noScanSubmit") public ApiResult noScanSubmit(@Valid @RequestBody @NotNull NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); request.getItems() .forEach(data -> VUtil.trueThrowBusinessError(noScanningBaseControllerService.existsQrCode(data.getMaterialNo())) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 674a3688..31f43297 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -232,6 +232,7 @@ public class NormalPGIController extends BaseController { @ApiMark(moduleName = "送货单管理", apiName = "无码收货确认") public ApiResult noScanSubmit(@Valid @RequestBody @NotNull NoScanningRequest request) { request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); WmsSrmOrder order = wmsSrmOrderService.lambdaQuery() .eq(Objects.nonNull(request.getId()), WmsSrmOrder::getId, request.getId()) .eq(StrUtil.isNotBlank(request.getNo()), WmsSrmOrder::getNoteNum, request.getNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java index 982b3ba6..9d518150 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java @@ -75,6 +75,7 @@ public class NormalQMController extends BaseController { @Resource private IWmsQrCodeMasterService qrCodeMasterService; + @Resource private SapService sapService; /** diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index 33c3a716..1843f8c6 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -328,6 +328,8 @@ public class OutAssistanceController extends BaseController { @Transactional @PostMapping("noScanSubmit") public ApiResult noScanSubmit(@Valid @RequestBody @NotNull NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); WmsOutAssistance order = outAssistanceService.lambdaQuery() .eq(Objects.nonNull(request.getId()), WmsOutAssistance::getId, request.getId()) .eq(StrUtil.isNotBlank(request.getNo()), WmsOutAssistance::getNo, request.getNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java index 0663b425..98555782 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java @@ -329,6 +329,8 @@ public class OutCostCenterController extends BaseController { @Transactional @PostMapping("noScanSubmit") public ApiResult noScanSubmit(@Valid @RequestBody @NotNull NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); WmsOutCostcenter order = outCostcenterService.lambdaQuery() .eq(Objects.nonNull(request.getId()), WmsOutCostcenter::getId, request.getId()) .eq(StrUtil.isNotBlank(request.getNo()), WmsOutCostcenter::getNo, request.getNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 80a5e006..5a706ec5 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -465,6 +465,8 @@ public class OutProduceController extends BaseController { @Transactional @PostMapping("noScanSubmit") public ApiResult noScanSubmit(@Valid @RequestBody @NotNull NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); WmsOutProduce order = outProduceService.lambdaQuery() .eq(Objects.nonNull(request.getId()), WmsOutProduce::getId, request.getId()) .eq(StrUtil.isNotBlank(request.getNo()), WmsOutProduce::getNo, request.getNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index 99fe20d8..b23b3ef0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -181,6 +181,8 @@ public class OutPurchaseController extends BaseController { @Transactional @PostMapping("noScanSubmit") public ApiResult noScanSubmit(@Valid @RequestBody @NotNull NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); WmsReturnRequest returnRequest = returnRequestService.lambdaQuery() .eq(Objects.nonNull(request.getId()), WmsReturnRequest::getId, request.getId()) .eq(StrUtil.isNotBlank(request.getNo()), WmsReturnRequest::getApplicationNo, request.getNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 475a04e0..99a16d43 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -541,6 +541,8 @@ public class TransferCompanyController extends BaseController { @Transactional @PostMapping("pda/submitForOutNoScanning") public ApiResult submitForOutNoScanning(@Valid @RequestBody NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); WmsTransferCompany order = transferCompanyService.lambdaQuery() .eq(Objects.nonNull(request.getId()), WmsTransferCompany::getId, request.getId()) .eq(StrUtil.isNotBlank(request.getNo()), WmsTransferCompany::getNo, request.getNo()) @@ -1072,6 +1074,8 @@ public class TransferCompanyController extends BaseController { @Transactional @PostMapping("pda/submitForInNoScanning") public ApiResult submitForInNoScanning(@Valid @RequestBody NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId(), request.getNo()); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在"); VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效"); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index 1702bdc9..7794ee2d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -568,6 +568,8 @@ public class TransferFactoryController extends BaseController { @Transactional @PostMapping("pda/submitForOutNoScanning") public ApiResult submitForOutNoScanning(@Valid @RequestBody NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); WmsTransferFactory order = transferFactoryService.lambdaQuery() .eq(Objects.nonNull(request.getId()), WmsTransferFactory::getId, request.getId()) .eq(StrUtil.isNotBlank(request.getNo()), WmsTransferFactory::getNo, request.getNo()) @@ -1045,6 +1047,8 @@ public class TransferFactoryController extends BaseController { @Transactional @PostMapping("pda/submitForInNoScanning") public ApiResult submitForInNoScanning(@Valid @RequestBody @NotNull NoScanningRequest request) { + request.getItems().removeIf(it -> CollectionUtil.isEmpty(it.getDatas())); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(request.getItems())).throwMessage("无效数据"); TransferFactoryTicketInfoVO ticket = transferFactoryTicketService.getInfo(request.getId(), request.getNo()); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在"); VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效"); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java index a673d503..57cc22c4 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java @@ -20,7 +20,7 @@ public class QmsIncomingInspectionIssueTicketAuditQO { private Long id; /** - * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用 + * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让步接收 */ @NotNull(message = "审批状态不能为空") private Short approvalStatus; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java index 3b9269d6..faf9e390 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java @@ -92,7 +92,7 @@ public class WmsIncomingInspectionTaskCallbackQO { private String purchaseGroup; /** - * 处理结果:0=通过,3=报废,4=维修,5=挑选使用,6=让渡使用 + * 处理结果:0=通过,3=报废,4=维修,5=挑选使用,6=让步接收 */ private Short processingResult = 0; 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 54e83b3e..465ef94a 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 @@ -66,7 +66,7 @@ public class WmsInventoryInspectionTaskCallbackQO { private Boolean inspectionResult; /** - * 处理结果:0=通过,3=报废,4=维修,5=挑选使用,6=让渡使用 + * 处理结果:0=通过,3=报废,4=维修,5=挑选使用,6=让步接收 */ private Short processingResult = 0; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java index 050b9c18..f2e351d6 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java @@ -99,7 +99,7 @@ public class QmsIssueTicketDetailVO { private String createApprovalOpinion; /** - * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用 + * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让步接收 */ private Short approvalStatus; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java index 4fef142f..92cb6f0d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java @@ -94,7 +94,7 @@ public class QmsIssueTicketVO { private String createApprovalOpinion; /** - * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用 + * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让步接收 */ private Short approvalStatus; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java index 7359cd0e..79256d42 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java @@ -128,7 +128,7 @@ public class QmsPdiTicketMyDetailVO { private LocalDateTime completeTime; /** - * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用 + * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让步接收 */ private Short approvalStatus; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTicketReportVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTicketReportVO.java index e745fb99..3d30aa8f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTicketReportVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTicketReportVO.java @@ -95,7 +95,7 @@ public class QmsTicketReportVO { */ @Data public static class CompletionStatus { - /** 审批结果(0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用) */ + /** 审批结果(0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让步接收) */ private Short approvalStatus; /** 状态名称 */ private String statusName; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java index 5d2cc58a..8768008e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java @@ -125,7 +125,7 @@ public class QmsIssueTicket implements Serializable { private Integer overdue; /** - * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用 + * 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让步接收 */ private Short approvalStatus;