From bbbdfae633f9c8b9446221c9b423655aa867431b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 9 May 2020 11:15:46 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=88=86=E7=B1=BB=E5=AE=9E=E4=BD=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index fe7f66d..63e108f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -20,6 +20,9 @@ public class BasBeanInfoModel implements Serializable { private static final long serialVersionUID = -6376845639646448495L; + @ApiParam(value = "系统名称") + public String systemName; + @ApiParam(value = "实体名称") public String entityName; From 7ef769268d3200c06c38a8961c073c09b0df64f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 11:38:35 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=92=8C=E6=A3=80=E9=AA=8C=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=AE=9E=E4=BD=93=E4=B8=8E=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 95 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 85 +++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 77 ++++++++++++++++++ 3 files changed, 257 insertions(+) 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 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 e126301..4437fc2 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 @@ -2506,6 +2506,7 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { + IN_MATERIAL_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), END_CHECK(30, "尾检"); @@ -5174,4 +5175,98 @@ public class MesEnumUtil { } } + /** + * MES_检验单 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_STATUS { + + CREATE(10, "创建"), + IN_EXEC(20, "执行中"), + COMPLETE(30, "完成"); + + private int value; + private String description; + + MES_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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * MES_检验单 检测整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_RESULT { + + PASS(10, "通过"), + NO_PASS(20, "不通过"), + COMPROMISE_PASS(30, "让步通过"); + + private int value; + private String description; + + MES_QC_CHECK_RESULT(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } 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..2f29e00 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.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 java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @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 = -8961182786427690154L; + @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 = "QTY") + @ApiParam("数量") + private BigDecimal qty; + + @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_RESULT") + @ApiParam("检测整体结果") + private Integer checkResult; +} 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..9471a66 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -0,0 +1,77 @@ +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; +import java.math.BigDecimal; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER") +@Api("MES_检验单") +public class MesQcOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182786786500154L; + @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 partName; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String supplierCode; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private String fixLotNo; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CHECK_RESULT") + @ApiParam("检测整体结果") + private Integer checkResult; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; +} From 6d7d8de7b3e0a37cf3ddd0e9b4646cd28d22e8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 11:50:00 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=92=8CMES=5F=E6=A3=80=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9A=84=E5=AE=9E=E4=BD=93=E5=92=8C=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 1 - 1 file changed, 1 deletion(-) 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 9471a66..2b88d9a 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 @@ -13,7 +13,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.io.Serializable; -import java.math.BigDecimal; /** * @Description :mes系统业务动作 From a1579a2484d2aa438e1b508e56815d0345094214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 13:39:14 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E8=A1=A8model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- .../i3plus/pojo/mes/model/QcDetailReportModel.java | 57 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 36 ++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java 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 From abbab6bda4501370a224463fc1c2705888eb416f Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sat, 9 May 2020 17:37:20 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=A8=A1=E5=9D=97=E6=A3=80=E7=B4=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java index d38f6c9..21da796 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FilterRule.java @@ -6,5 +6,5 @@ import lombok.Data; public class FilterRule { private String field; private String op; - private String value; + private Object value; } From 4f5f9777a2003c0c8a76a86a8f1b7e6013a2e7a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 17:56:42 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E4=B8=8Emodel=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 5 ++ .../i3plus/pojo/mes/model/QcDetailReportModel.java | 57 ---------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 +++++- 3 files changed, 19 insertions(+), 58 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java 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 index 2f29e00..dcc8eed 100644 --- 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 @@ -12,6 +12,7 @@ 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; import java.math.BigDecimal; @@ -82,4 +83,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @Column(name = "CHECK_RESULT") @ApiParam("检测整体结果") private Integer checkResult; + + @Transient + @ApiParam("供应商名称") + private String supplierName; } 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 deleted file mode 100644 index d29da2c..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcDetailReportModel.java +++ /dev/null @@ -1,57 +0,0 @@ -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 4591186..de193d7 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 @@ -5,7 +5,6 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; @@ -964,6 +963,20 @@ public class MesHqlPack { } /** + * MES 检验单查询条件封装 + * + * @param qcOrderDetail + * @return + */ + public static DdlPackBean getMesQcDetailReport(MesQcOrderDetail qcOrderDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode); + if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean); + } + return packBean; + } + + /** * MES 物料信息查询条件封装 * * @param part From f302b4d5f1289d89ba9097ec8f38d188ec1515ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 9 May 2020 18:14:07 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9MES=5F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 33fb5c9..7af9162 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 @@ -12,6 +12,7 @@ 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; /** @@ -52,7 +53,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_GUIDE") @ApiParam("检测指导") - private String supplierCode; + private String checkGuide; @Column(name = "CHECK_FREQUENCY") @ApiParam("频率") @@ -60,7 +61,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String fixLotNo; + private String isConCession; @Column(name = "STATUS") @ApiParam("状态") @@ -73,4 +74,12 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; + + @Transient + @ApiParam("本批次生产总数") + private Integer currentLotNoSum; + + @Transient + @ApiParam("收货批次") + private String srcLotNo; } From 7ac98ffbc698c392044eb8536b10aba29fb8d00a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sat, 9 May 2020 19:34:22 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E3=80=901797=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E5=AE=9A=E5=88=B6=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1-VDA=E6=A0=87=E7=AD=BE=E9=98=B2=E9=94=99=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 127238a..d80d80b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -85,4 +85,8 @@ public class WmsSnOperateRecord extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String refSN; + @Column(name = "REMARK") + @ApiParam(value = "备注") + private String remark; + } From 98091426f2e1b2f23da7abccb8c4cfc20eabd783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 11:30:35 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7af9162..7cf7251 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 @@ -27,8 +27,8 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_ORDER") -@Api("MES_检验单") +@Table(name = "MES_QC_ORDER_DETAIL") +@Api("MES_检验单明细") public class MesQcOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -8961182786786500154L; @Column(name = "ORDER_NO") From 79e90298ef4b161d1d993734eb0468eb16745712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 13:36:47 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) 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 7cf7251..599196a 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 @@ -61,7 +61,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String isConCession; + private String isConcession; @Column(name = "STATUS") @ApiParam("状态") 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 de193d7..992531d 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 @@ -2568,6 +2568,24 @@ public class MesHqlPack { return packBean; } + /** + * 供应商 + * + * @param basVendor + * @param organizeCode + * @return + */ + public static DdlPackBean getMesBasVendor(BasVendor basVendor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(basVendor, organizeCode); + if (!StringUtils.isEmpty(basVendor.getVendorNo())) { + DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", packBean); + } + if (!StringUtils.isEmpty(basVendor.getVendorDesc())) { + DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", packBean); + } + return packBean; + } + public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); From 78ff224fe43b6700c28845065083d2edd3504682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 11 May 2020 14:00:26 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ------------------ 1 file changed, 18 deletions(-) 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 992531d..de193d7 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 @@ -2568,24 +2568,6 @@ public class MesHqlPack { return packBean; } - /** - * 供应商 - * - * @param basVendor - * @param organizeCode - * @return - */ - public static DdlPackBean getMesBasVendor(BasVendor basVendor, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(basVendor, organizeCode); - if (!StringUtils.isEmpty(basVendor.getVendorNo())) { - DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", packBean); - } - if (!StringUtils.isEmpty(basVendor.getVendorDesc())) { - DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", packBean); - } - return packBean; - } - public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); From 80e572f07d65cd2af879dad47324919d60539d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 11 May 2020 15:28:24 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E4=BC=98=E5=8C=96=E5=AE=9E=E4=BD=93=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java | 46 ++++++++++++++++++++++ .../wms/repository/WmsThymeleafRepository.java | 16 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++++ 3 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java new file mode 100644 index 0000000..d8b72ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.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.Lob; +import javax.persistence.Table; + +/** + * @Description : WMS回显模板数据 + * @Reference : + * @Author : siliter + * @CreateDate : 2020-05-11 09:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_THYMELEAF") +@Api("WMS回显模板数据") +public class WmsThymeleaf extends BaseBean { + + private static final long serialVersionUID = -5751852067398308165L; + + @Column(name = "TL_CODE") + @ApiParam("模板代码") + private String tlCode; + + @Column(name = "TL_DESC") + @ApiParam("模板描述") + private String tlDesc; + + @Lob + @Column(name = "TL_CONTENT", columnDefinition = "TEXT") + @ApiParam(value = "模板内容") + private String tlContent; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java new file mode 100644 index 0000000..54c1aa5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsThymeleafRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsThymeleaf; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter + * @CreateDate : 2020-05-11 09:17 + * @Modify: + **/ +@Repository +public interface WmsThymeleafRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 663b86c..55dd8fd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -3229,4 +3229,17 @@ public class WmsHqlPack { getStringBuilderPack(checkType, result); return result; } + + /** + * 模板信息分页查询条件 + * @param thymeleaf + * @return + */ + public static DdlPackBean packHqlWmsThymeleaf(WmsThymeleaf thymeleaf) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(thymeleaf.getTlCode(), "tlCode", result); + DdlPreparedPack.getStringLikerPack(thymeleaf.getTlDesc(), "tlDesc", result); + getStringBuilderPack(thymeleaf, result); + return result; + } } From 24806b9e2e2f72560e0ca58417321b84e7ea07b6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 11 May 2020 17:38:40 +0800 Subject: [PATCH 13/13] =?UTF-8?q?[oee=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 2a3b94c..d40e746 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -68,13 +68,13 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,3)") @ApiParam("总生产时间") - private String totalRunTime; + private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,3)") @ApiParam("总停机时间") - private String totalStopTime; + private Double totalStopTime; @Column(name = "TOTAL_QTY") @ApiParam("总生产数") @@ -92,21 +92,21 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,3)") @ApiParam("时间开动率") - private String timeRate; + private Double timeRate; - @Column(name = "TAKT_RATE") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,3)") @ApiParam("性能开动率") - private String taktRate; + private Double taktRate; - @Column(name = "QUALIFIED_RATE") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,3)") @ApiParam("良品率") - private String qualifiedRate; + private Double qualifiedRate; - @Column(name = "OEE") + @Column(name = "OEE", columnDefinition = "decimal(18,3)") @ApiParam("OEE") - private String oee; + private Double oee; @Column(name = "BUSI_DATA") @ApiParam("自定义数据")