refactor(qms): 更新质检任务回调参数和查询逻辑
- 将物料编号字段重命名为机型编号,统一使用modelNo - 新增机台编号字段deviceNo用于设备识别 - 为机型编号添加NotBlank校验注解 - 修改质检控制器中的查询条件,使用机型编号和工位编号进行匹配 - 移除旧的物料编号字段引用,优化查询逻辑
This commit is contained in:
parent
26b5f43956
commit
6c81dfdf93
|
|
@ -1,5 +1,6 @@
|
||||||
package com.nflg.wms.common.pojo.qo;
|
package com.nflg.wms.common.pojo.qo;
|
||||||
|
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import lombok.Data;import lombok.experimental.Accessors;
|
import lombok.Data;import lombok.experimental.Accessors;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
|
@ -12,9 +13,14 @@ public class PdiInspectionTaskCallbackQO {
|
||||||
private String orderNo;
|
private String orderNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料编号
|
* 机型编号
|
||||||
*/
|
*/
|
||||||
private String materialNo;
|
private String modelNo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 机台编号
|
||||||
|
*/
|
||||||
|
private String deviceNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 质检是否合格
|
* 质检是否合格
|
||||||
|
|
|
||||||
|
|
@ -244,7 +244,8 @@ public class QmsController extends BaseController {
|
||||||
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
|
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
|
||||||
WmsInProduceOrderItem item = produceOrderItemService.lambdaQuery()
|
WmsInProduceOrderItem item = produceOrderItemService.lambdaQuery()
|
||||||
.eq(WmsInProduceOrderItem::getOrderId, order.getId())
|
.eq(WmsInProduceOrderItem::getOrderId, order.getId())
|
||||||
.eq(WmsInProduceOrderItem::getMaterialNo, qo.getMaterialNo())
|
.eq(WmsInProduceOrderItem::getModelNo, qo.getModelNo())
|
||||||
|
.eq(WmsInProduceOrderItem::getWorkbenchNo, qo.getDeviceNo())
|
||||||
.one();
|
.one();
|
||||||
item.setInspectionStatus(qo.isPass() ? 1 : 2);
|
item.setInspectionStatus(qo.isPass() ? 1 : 2);
|
||||||
produceOrderItemService.updateById(item);
|
produceOrderItemService.updateById(item);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue