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

refactor(qms): 优化质检回调处理逻辑 

- 简化质检单存在性检查逻辑，使用exists方法替代查询列表
- 优化收货明细更新方式，改用实体对象更新替代lambdaUpdate
- 修复二维码更新中的字段映射错误，将materialCode改为barcodeCode
- 调整二维码状态更新条件，将或操作改为与操作
- 优化PDI检测回调的日志信息和事务注解位置
- 统一质检相关日志信息格式，增加业务标识区分
This commit is contained in:
曹鹏飞 2026-06-14 21:11:32 +08:00
parent ec9d08280f
commit ab3498e452
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java
View File

@ -70,14 +70,11 @@ public class QmsController extends BaseController {
@Transactional
@PostMapping("/iqc/incoming")
public ApiResult<Void> iqcIncoming(@RequestBody @NotNull WmsIncomingInspectionTaskCallbackQO qo) {
log.info("质检单解析完成, 单号: {}, 物料: {}, 结果: {}", qo.getDeliveryOrderNo(), qo.getMaterialNo(), qo.getInspectionResult());
List<WmsSrmQualityInspection> inspects = srmQualityInspectionService.lambdaQuery()
log.info("IQC检测回调, 单号: {}, 物料: {}, 结果: {}", qo.getDeliveryOrderNo(), qo.getMaterialNo(), qo.getInspectionResult());
VUtil.trueThrowBusinessError(srmQualityInspectionService.lambdaQuery()
.eq(WmsSrmQualityInspection::getInspectionNum, qo.getTaskNo())
.list();
if (CollectionUtil.isNotEmpty(inspects)) {
log.warn("质检单已存在, 跳过处理: {}", qo.getTaskNo());
VUtil.trueThrowBusinessError(true).throwMessage("质检单已存在");
}
.exists()
).throwMessage("质检单已存在");
// 找到入库的明细
WmsQcReceiveItem receiveItem = qcReceiveItemService.lambdaQuery()
@ -174,12 +171,10 @@ public class QmsController extends BaseController {
Pair<String, String> returnDto = sapService.zwm3a18(zwm3A18DTO);
log.info("SAP质检入库返回, 物料凭证: {}, 年份: {}", returnDto.getKey(), returnDto.getValue());
// 更新收货明细的物料凭证和入库数量
qcReceiveItemService.lambdaUpdate()
.eq(WmsQcReceiveItem::getId, receiveItem.getId())
.set(WmsQcReceiveItem::getInQty, qo.getQualifiedQty())
.set(WmsQcReceiveItem::getMaterialDoc, returnDto.getKey())
.set(WmsQcReceiveItem::getMaterialDocYear, returnDto.getValue())
.update();
receiveItem.setInQty(BigDecimal.valueOf(qo.getQualifiedQty()));
receiveItem.setMaterialDoc(returnDto.getKey());
receiveItem.setMaterialDocYear(returnDto.getValue());
qcReceiveItemService.updateById(receiveItem);
// 检查并更新收货单完成状态
List<WmsQcReceiveItem> allItems = qcReceiveItemService.lambdaQuery()
@ -210,34 +205,34 @@ public class QmsController extends BaseController {
.eq(WmsQcReceive::getOrderNo, inspect.getNoteNum())
.set(WmsQcReceive::getIsCheck, isCheck)
.update();
qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), inspect.getReceiveNum());
qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), receiveItem.getMaterialDoc());
//更新二维码数量
if (CollectionUtil.isNotEmpty(qo.getQrCodes())) {
List<WmsQrCodeMaster> qrCodeMasters = qrCodeMasterService.getByCodes(qo.getQrCodes().stream().map(MaterialQrCodeDTO::getQrCode).toList());
qrCodeMasters.forEach(qrCodeMaster -> {
MaterialQrCodeDTO dto = qo.getQrCodes().stream()
.filter(qrCodeDTO -> StrUtil.equals(qrCodeDTO.getQrCode(), qrCodeMaster.getMaterialCode()))
.filter(qrCodeDTO -> StrUtil.equals(qrCodeDTO.getQrCode(), qrCodeMaster.getBarcodeCode()))
.findFirst()
.get();
qrCodeMaster.setQuantity(qrCodeMaster.getQuantity().subtract(BigDecimal.valueOf(dto.getUnqualifiedQty())));
VUtil.trueThrowBusinessError(qrCodeMaster.getQuantity().compareTo(BigDecimal.ZERO) < 0)
.throwMessage(dto.getQrCode() + "数据异常");
if (qrCodeMaster.getQuantity().compareTo(BigDecimal.ZERO) == 0 || qrCodeMaster.getParentBarcodeId() > 0) {
if (qrCodeMaster.getQuantity().compareTo(BigDecimal.ZERO) == 0 && qrCodeMaster.getParentBarcodeId() > 0) {
qrCodeMaster.setParentBarcodeId(0L);
}
});
qrCodeMasterService.updateBarCode(qrCodeMasters);
}
log.info("质检单处理完成: {}, 结果: {}", qo.getTaskNo(), inspect.getInspectionResult());
log.info("IQC检测回调处理完成: {}, 结果: {}", qo.getTaskNo(), inspect.getInspectionResult());
return ApiResult.success();
}
/**
* PDI检测回调
*/
@Transactional
@PostMapping("/pdi")
public ApiResult<Void> pdi(@RequestBody @NotNull PdiInspectionTaskCallbackQO qo) {
log.info("质检单解析完成, 单号: {}, 是否合格: {}", qo.getOrderNo(), qo.isPass());
log.info("PDI检测回调, 单号: {}, 是否合格: {}", qo.getOrderNo(), qo.isPass());
WmsInProduceOrder order = produceOrderService.getByNo(qo.getOrderNo());
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
WmsInProduceOrderItem item = produceOrderItemService.lambdaQuery()