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