From 6c81dfdf93becdae0169e61f28a39721cc5707b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 10 Jun 2026 20:00:31 +0800 Subject: [PATCH] =?UTF-8?q?refactor(qms):=20=E6=9B=B4=E6=96=B0=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1=E5=9B=9E=E8=B0=83=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将物料编号字段重命名为机型编号，统一使用modelNo - 新增机台编号字段deviceNo用于设备识别 - 为机型编号添加NotBlank校验注解 - 修改质检控制器中的查询条件，使用机型编号和工位编号进行匹配 - 移除旧的物料编号字段引用，优化查询逻辑 --- .../common/pojo/qo/PdiInspectionTaskCallbackQO.java | 10 ++++++++-- .../nflg/wms/srm/receive/controller/QmsController.java | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java index 36e37db3..0d584841 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import jakarta.validation.constraints.NotBlank; import lombok.Data;import lombok.experimental.Accessors; @Data @@ -12,9 +13,14 @@ public class PdiInspectionTaskCallbackQO { private String orderNo; /** - * 物料编号 + * 机型编号 */ - private String materialNo; + private String modelNo; + + /** + * 机台编号 + */ + private String deviceNo; /** * 质检是否合格 diff --git a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java index dd76022e..d722dd79 100644 --- a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java +++ b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java @@ -244,7 +244,8 @@ public class QmsController extends BaseController { VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); WmsInProduceOrderItem item = produceOrderItemService.lambdaQuery() .eq(WmsInProduceOrderItem::getOrderId, order.getId()) - .eq(WmsInProduceOrderItem::getMaterialNo, qo.getMaterialNo()) + .eq(WmsInProduceOrderItem::getModelNo, qo.getModelNo()) + .eq(WmsInProduceOrderItem::getWorkbenchNo, qo.getDeviceNo()) .one(); item.setInspectionStatus(qo.isPass() ? 1 : 2); produceOrderItemService.updateById(item);