From 60973a3ee0153ba1fc9e50dfd1f19eefa7e2af19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 13 May 2020 14:03:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=901804=20=E8=B4=A8=E6=A3=80=E6=A3=80?= =?UTF-8?q?=E6=B5=8B-=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 79 ++++++++++++++- .../cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 89 +++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java | 64 ++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 110 +++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 85 ++++++++++++++++ .../i3plus/pojo/mes/model/IfQcOrderDataModel.java | 94 ++++++++++++++++++ .../pojo/mes/repository/IfQcOrderRepository.java | 15 +++ .../pojo/mes/repository/IfQcResultRepository.java | 14 +++ .../mes/repository/MesQcOrderDetailRepository.java | 14 +++ .../pojo/mes/repository/MesQcOrderRepository.java | 14 +++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 19 ++++ 12 files changed, 670 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cdb17df..fb951e6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2580,10 +2580,11 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - + INCOMING_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + ND_CHECK(30, "末检"), + RC_CHECK(40, "发货检验"); private int value; private String description; @@ -5572,4 +5573,76 @@ public class MesEnumUtil { } } + /** + * 质检单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + CREATE(10, "创建"), + RECEIPT(20, "执行中"), + SUBMISSION(30, "提交"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + QC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 接口读取标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IN_READ_FLAG { + NOTREAD(0, "未读取"), + READ(1, "已读取"); + + private int value; + private String description; + + IN_READ_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 900dbb7..6ed4888 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -925,10 +925,11 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - + INCOMING_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"); + END_CHECK(30, "末检"), + RC_CHECK(40, "发货检验"); private int value; private String description; @@ -3564,4 +3565,78 @@ public class MesPcnEnumUtil { return description; } } + + /** + * 质检单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_STATUS { + CREATE(10, "创建"), + RECEIPT(20, "执行中"), + SUBMISSION(30, "提交"), + COMPLETE(40, "完成"); + + private int value; + private String description; + + QC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 整体检测结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_REULST { + + PASS(10, "通过"), + NON_PASS(20, "不通过"), + CONCESSION_PRODUCTION(30, "让步生产"); + + private int value; + private String description; + + CHECK_REULST(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java new file mode 100644 index 0000000..cb47ab9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_QC_ORDER") +@Api("IF_质检单") +public class IfQcOrder extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0D; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organiztionCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java new file mode 100644 index 0000000..186a0ac --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_QC_RESULT") +@Api("IF_质检结果") +public class IfQcResult extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "QC_RESULT") + @ApiParam("质检结果") + private String qcResult; + + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organiztionCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java new file mode 100644 index 0000000..c8b26e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -0,0 +1,110 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER") +@Api("MES_检验单") +public class MesQcOrder extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") + private Double finishQty = 0D; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0D; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "RELATION_ORDER_NO") + @ApiParam("关联单号") + private String relationOrderNo; + + @Column(name = "UUID") + @ApiParam("数据唯一编号") + private String uuid; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CHECK_REULST") + @ApiParam("检测整体结果") + private Integer checkReulst = 0; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @ApiParam(value = "检测结果") + @Transient + private String reulstStatus; + + @ApiParam(value = "产品条码") + @Transient + private String serialNumber; + + @ApiParam(value = "产线") + @Transient + private String workCenterCode; + + @ApiParam(value = "工单号") + @Transient + private String mesWorkNo; + +} 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 new file mode 100644 index 0000000..ea263b4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -0,0 +1,85 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_DETAIL") +@Api("MES_检验单明细") +public class MesQcOrderDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private Integer isConcession = 0; + + @Column(name = "CHECK_REULST") + @ApiParam("判定结果") + private Integer checkReulst = 0; + + @Column(name = "ITEM_NO") + @ApiParam("检验行号") + private Integer itemNo = 0; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @ApiParam(value = "已完成数量") + @Transient + private Integer finishQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java new file mode 100644 index 0000000..ad18404 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\18 9:34 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("QC质检单model") +public class IfQcOrderDataModel extends BaseBean { + + @ApiParam("ruid") + private Long ruid; + + @ApiParam("收货流水号") + private Long uuid; + + @ApiParam("域") + private String werks; + + @ApiParam("地点") + private String lgort; + + @ApiParam("收货库位") + private String wlbrt; + + @ApiParam("单据号") + private String refid; + + @ApiParam("行号") + private Integer zeile; + + @ApiParam("业务类型") + private String action; + + @ApiParam("供应商编码") + private String lifnr; + + @ApiParam("物料编码") + private String matnr; + + @ApiParam("收货数量") + private String erfmg; + + @ApiParam("计量单位") + private String erfme; + + @ApiParam("检验编号") + private String chkno; + + @ApiParam("炉批号") + private String stono; + + @ApiParam("收货日期") + private String zpost; + + @ApiParam("收货时间") + private String ztime; + + @ApiParam("添加日期") + private String addtimeYmd; + + @ApiParam("添加时间") + private String addtimeHms; + + @ApiParam("处理日期") + private String finishtimeYmd; + + @ApiParam("处理时间") + private String finishtimeHms; + + @ApiParam("删除标记") + private Integer deleteFlag; + + @ApiParam("读取标识") + private Integer readFlag; + + @ApiParam("错误代码") + private String errCode; + + @ApiParam("错误信息") + private String errMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java new file mode 100644 index 0000000..64fe700 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPackageDetail; +import cn.estsh.i3plus.pojo.mes.bean.IfQcOrder; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfQcOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java new file mode 100644 index 0000000..1b3b78f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfQcResult; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfQcResultRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java new file mode 100644 index 0000000..bda45b5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java new file mode 100644 index 0000000..f9ff6c8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderRepository extends BaseRepository { +} 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 da8091d..e54b01b 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; @@ -437,4 +438,22 @@ public class MesPcnHqlPack { return packBean; } + + /** + * 获取工作中心下所有的投料数据 + * + * @param mesQcOrderDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQcOrderDetail(MesQcOrderDetail mesQcOrderDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean); + DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean); + if(mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()){ + DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty()+1, "itemNo", packBean); + } + return packBean; + } }