rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(qms): 修正来料检验任务中的数量字段和审批状态文本 

- 将来料检验任务中的inspectionQty和detectionQty字段从inspectionQty改为unqualifiedQty
- 统一修正审批状态中"让渡使用"为"让步接收"的术语表述
- 在多个控制器的无码提交接口中添加空数据校验和过滤逻辑
- 修复WMS系统来料检验任务回调中的处理结果参数注释
This commit is contained in:
曹鹏飞 2026-06-14 19:55:20 +08:00
parent 19c36cb42d
commit 433ffcb9fe
23 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
View File

@ -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<QmsIncomingInspectionTaskQr> qrs = incomingInspectionTaskQrService.lambdaQuery().eq(QmsIncomingInspectionTaskQr::getTaskId, taskId).list();

4
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -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 "未知";
}

2
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReportControllerService.java
View File

@ -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<QmsTicketReportVO.CompletionStatus> result = new ArrayList<>();
for (Map.Entry<Short, String> entry : approvalNames.entrySet()) {

4
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java
View File

@ -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);

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
View File

@ -246,6 +246,8 @@ public class InCostCenterBackController extends BaseController {
@Transactional
@PostMapping("noScanSubmit")
public ApiResult<Void> 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()))

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
View File

@ -254,6 +254,8 @@ public class InProduceBackController extends BaseController {
@Transactional
@PostMapping("noScanSubmit")
public ApiResult<Void> 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()))

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
View File

@ -463,6 +463,8 @@ public class InProduceOrderController extends BaseController {
@Transactional
@PostMapping("noScanSubmit")
public ApiResult<Void> 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()))

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -232,6 +232,7 @@ public class NormalPGIController extends BaseController {
@ApiMark(moduleName = "送货单管理", apiName = "无码收货确认")
public ApiResult<Void> 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())

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java
View File

@ -75,6 +75,7 @@ public class NormalQMController extends BaseController {
@Resource
private IWmsQrCodeMasterService qrCodeMasterService;
@Resource
private SapService sapService;
/**

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -328,6 +328,8 @@ public class OutAssistanceController extends BaseController {
@Transactional
@PostMapping("noScanSubmit")
public ApiResult<Void> 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())

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -329,6 +329,8 @@ public class OutCostCenterController extends BaseController {
@Transactional
@PostMapping("noScanSubmit")
public ApiResult<Void> 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())

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -465,6 +465,8 @@ public class OutProduceController extends BaseController {
@Transactional
@PostMapping("noScanSubmit")
public ApiResult<Void> 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())

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
View File

@ -181,6 +181,8 @@ public class OutPurchaseController extends BaseController {
@Transactional
@PostMapping("noScanSubmit")
public ApiResult<Void> 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())

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -541,6 +541,8 @@ public class TransferCompanyController extends BaseController {
@Transactional
@PostMapping("pda/submitForOutNoScanning")
public ApiResult<Void> 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<Void> 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("出库单无效");

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -568,6 +568,8 @@ public class TransferFactoryController extends BaseController {
@Transactional
@PostMapping("pda/submitForOutNoScanning")
public ApiResult<Void> 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<Void> 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("出库单无效");

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java
View File

@ -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;

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsIncomingInspectionTaskCallbackQO.java
View File

@ -92,7 +92,7 @@ public class WmsIncomingInspectionTaskCallbackQO {
private String purchaseGroup;
/**
* 处理结果：0=通过，3=报废，4=维修，5=挑选使用，6=让渡使用
* 处理结果：0=通过，3=报废，4=维修，5=挑选使用，6=让步接收
*/
private Short processingResult = 0;

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WmsInventoryInspectionTaskCallbackQO.java
View File

@ -66,7 +66,7 @@ public class WmsInventoryInspectionTaskCallbackQO {
private Boolean inspectionResult;
/**
* 处理结果：0=通过，3=报废，4=维修，5=挑选使用，6=让渡使用
* 处理结果：0=通过，3=报废，4=维修，5=挑选使用，6=让步接收
*/
private Short processingResult = 0;

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java
View File

@ -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;

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java
View File

@ -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;

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java
View File

@ -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;

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTicketReportVO.java
View File

@ -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;

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java
View File

@ -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;