diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java index fd18f12..5a8223f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDbCheckRecord.java @@ -57,7 +57,7 @@ public class MesDbCheckRecord extends BaseBean implements Serializable { @Column(name = "PRODUCT_DATA_ID") @ApiParam("生产记录表主键ID") - private String productDataId; + private Long productDataId; //是否停线:1=是,2=否 @Column(name = "IS_STOP_LINE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java new file mode 100644 index 0000000..2b5b50c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @CreateDate: 2020/9/24 + * @Author: simon.song + */ +@Data +public class MesDbCheckRecordModel { + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partDesc; + + @ApiParam("异常取值字段") + private String errorFiledCode; + + @ApiParam("异常描述") + private String errorDesc; + + public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String errorFiledCode, String errorDesc) { + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partDesc = partDesc; + this.errorFiledCode = errorFiledCode; + this.errorDesc = errorDesc; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 46b468c..3e7316f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -353,7 +353,7 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringLikerPack(dbCheckRecord.getErrorFiledCode(), "errorFiledCode", packBean); } if (!StringUtils.isEmpty(dbCheckRecord.getProductDataId())) { - DdlPreparedPack.getStringLikerPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); + DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getProductDataId(), "productDataId", packBean); } if (!StringUtils.isEmpty(dbCheckRecord.getIsStopLine())) { DdlPreparedPack.getNumberBiggerEqualPack(dbCheckRecord.getIsStopLine(), "isStopLine", packBean);