diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 2b88d9a..33fb5c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -44,7 +44,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_ITEM") @ApiParam("检测项") - private String partName; + private String checkItem; @Column(name = "CHECK_STANDARD") @ApiParam("检测标准") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java new file mode 100644 index 0000000..d29da2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QcDetailReportModel implements Serializable { + @ApiParam(value = "顾客名称") + private String customerName; + + @ApiParam(value = "供应商名称") + private String supplierName; + + @ApiParam(value = "供应商代码") + private String supplierCode; + + @ApiParam(value = "送货时间") + private String deliveryDate; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料描述") + private String partName; + + @ApiParam(value = "生产日期") + private String productDate; + + @ApiParam(value = "送货批次") + private String deliveryLotNo; + + @ApiParam(value = "本批次生产总数") + private String lotNoProdQry; + + @ApiParam(value = "供货数量") + private String supplyQty; + + @ApiParam(value = "检测类型") + private Integer checkType; + + @ApiParam(value = "检验项") + private String checkItem; + + @ApiParam(value = "检验要求") + private String checkStandard; + + @ApiParam(value = "检测值") + private String checkValue; + + @ApiParam(value = "检测结果") + private Integer checkResult; + + @ApiParam(value = "备注") + private String memo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index e3808fb..4591186 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -928,6 +928,42 @@ public class MesHqlPack { } /** + * MES 检验单查询条件封装 + * + * @param qcOrder + * @return + */ + public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode); + if (!StringUtils.isEmpty(qcOrder.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(qcOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getPartName())) { + DdlPreparedPack.getStringLikerPack(qcOrder.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getSupplierCode())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getSupplierCode(), "supplierCode", packBean); + } + // 时间段查询 + if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrder.getCreateDateTimeStart(), + qcOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(qcOrder.getModifyDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getModifyDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + qcOrder.getModifyDateTimeStart(), + qcOrder.getModifyDateTimeEnd(), + "modifyDatetime", packBean, true); + } + return packBean; + } + + /** * MES 物料信息查询条件封装 * * @param part