From dcaf007f4db4eea0cdd2508749f103da2e68fdee Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Oct 2019 09:44:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1107?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 8 ++++- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 6 ++-- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 12 ++++++++ .../mes/pcn/repository/MesFiCfgRepository.java | 17 ++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 8 ++++- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 6 ++-- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 12 ++++++++ .../pojo/mes/repository/MesFiCfgRepository.java | 17 ++++++++++ 11 files changed, 116 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFiCfgRepository.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 8403580..439677b 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 @@ -49,6 +49,42 @@ public class MesEnumUtil { } /** + * 条码类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PRODUCE_SN_TYPE { + + NORMAL(10, "正常件"), + FIRST_INSPECTION(20, "首检件"); + + private int value; + private String description; + + MES_PRODUCE_SN_TYPE(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; + } + } + + /** * mes 图片面位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java index b450200..7df328e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java @@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean { @Column(name = "FI_QTY") @ApiParam("首检数量") - private String fiQty; + private Double fiQty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 1704282..ff3d432 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -115,7 +115,7 @@ public class MesProduceSn extends BaseBean { @Column(name = "SN_TYPE") @ApiParam("条码类型 10=正常 20=首检件") - private String snType; + private Integer snType; @Column(name = "TRAY") @ApiParam("托盘号") @@ -149,6 +149,10 @@ public class MesProduceSn extends BaseBean { return this.printStatus == null ? 0 : this.printStatus; } + public int getSnTypeVal() { + return this.snType == null ? 0 : this.snType; + } + @Override public String toString() { return "MesProduceSn{" + @@ -172,6 +176,8 @@ public class MesProduceSn extends BaseBean { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", packageSn='" + packageSn + '\'' + + ", snType='" + snType + '\'' + + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + '}'; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 82024e9..c6a9f8e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean { @Column(name = "FI_QTY") @ApiParam("首检数量") - private Long fiQty; + private Double fiQty; @Column(name = "FI_COMPLETE_QTY") @ApiParam("首检完成数量") - private Long fiCompleteQty; + private Double fiCompleteQty; @Column(name = "FI_GENERATE_QTY") @ApiParam("首检生成数量") - private Long fiGenerateQty; + private Double fiGenerateQty; /********************** 冗余字段 *********************************/ @Transient diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java index d51705d..616096a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean { @ApiParam("客户订单号") private String custOrderNo; + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; + + @Column(name = "FI_COMPLETE_QTY") + @ApiParam("首检完成数量") + private Double fiCompleteQty; + + @Column(name = "FI_GENERATE_QTY") + @ApiParam("首检生成数量") + private Double fiGenerateQty; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java new file mode 100644 index 0000000..0050530 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFiCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesFiCfgRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index f141d6d..0ee50ab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean { @Column(name = "FI_QTY") @ApiParam("首检数量") - private String fiQty; + private Double fiQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 773d6ce..fa582cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -115,7 +115,7 @@ public class MesProduceSn extends BaseBean { @Column(name = "SN_TYPE") @ApiParam("条码类型") - private String snType; + private Integer snType; @Column(name = "TRAY") @ApiParam("托盘号") @@ -145,6 +145,10 @@ public class MesProduceSn extends BaseBean { return this.printStatus == null ? 0 : this.printStatus; } + public int getSnTypeVal() { + return this.snType == null ? 0 : this.snType; + } + @Override public String toString() { return "MesProduceSn{" + @@ -168,6 +172,8 @@ public class MesProduceSn extends BaseBean { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", packageSn='" + packageSn + '\'' + + ", snType='" + snType + '\'' + + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + '}'; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 13037ce..864d687 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean { @Column(name = "FI_QTY") @ApiParam("首检数量") - private String fiQty; + private Double fiQty; @Column(name = "FI_COMPLETE_QTY") @ApiParam("首检完成数量") - private String fiCompleteQty; + private Double fiCompleteQty; @Column(name = "FI_GENERATE_QTY") @ApiParam("首检生成数量") - private String fiGenerateQty; + private Double fiGenerateQty; /********************** 冗余字段 *********************************/ @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 8145bd4..f3c006d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean { @ApiParam("客户订单号") private String custOrderNo; + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; + + @Column(name = "FI_COMPLETE_QTY") + @ApiParam("首检完成数量") + private Double fiCompleteQty; + + @Column(name = "FI_GENERATE_QTY") + @ApiParam("首检生成数量") + private Double fiGenerateQty; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFiCfgRepository.java new file mode 100644 index 0000000..85077f4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFiCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFiCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesFiCfgRepository extends BaseRepository { + +} From 0011a4bc56870ecac1acee54020eee3b2f8a8221 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 30 Oct 2019 10:42:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1089=20?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 26bccb6..7d03fcd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -95,6 +95,10 @@ public class MesQcCheckData extends BaseBean { private String custCode; @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient @ApiParam("过程质量检测数据") private List mesQcCheckStandardList; From 2f382d37ccf545640d72c849fa902cf81f375363 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Oct 2019 11:37:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1124?= =?UTF-8?q?=EF=BC=8C=E9=A6=96=E6=A3=80=E4=BB=B6=E9=85=8D=E7=BD=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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 33494dc..38beffe 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 @@ -1553,4 +1553,24 @@ public class MesHqlPack { } return packBean; } + + /** + * 按条件分页查询首检件配置信息 + * @param mesFiCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesFiCfg(MesFiCfg mesFiCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesFiCfg, organizeCode); + if (!StringUtils.isEmpty(mesFiCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesFiCfg.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesFiCfg.getPartNo())) { + DdlPreparedPack.getStringEqualPack(mesFiCfg.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesFiCfg.getCustCode())) { + DdlPreparedPack.getStringLikerPack(mesFiCfg.getCustCode(), "custCode", packBean); + } + return packBean; + } }