From 16073eb7e501cb28c8fa61d8edd6a18553ca34f3 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 10 Oct 2019 19:31:01 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=99=84=E5=B1=9E?= =?UTF-8?q?=E8=A1=A8=E6=8F=92=E5=85=A5=E6=97=B6=EF=BC=8C=20=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E6=95=B0=E6=8D=AE=EF=BC=9B=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=9D=A5=E6=BA=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 2 +- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 48 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index 778baae..aaf5666 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="ANDON_MANAGE_ATTACH") -@Api(value="安灯任务附属信息") +@Api(value="安灯附属表") public class AndonQueueAttach extends BaseBean { @Column(name="PROD_INFO") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index d3688eb..6b6c9ad 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -11,6 +11,54 @@ import org.apache.commons.lang3.StringUtils; * @Modify: **/ public class AndonEnumUtil { + /** + * 语音播报类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_VOICE_TYPE{ + MIC_EN("10","Microsoft Anna - English (United States)"), + MIC_LILI("20","Microsoft Lili - Chinese (China)"), + AI_MALE("30","Aisound_male"), + AI_FEMALE("40","Aisound_female"), + MIC_ZIRE_EN("50","Microsoft Zira Desktop - English (United States)"), + MIC_HUI_CH("60","Microsoft Huihui Desktop - Chinese (Simplified)"); + + private String value; + private String description; + + ANDON_VOICE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value,val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * 标准处理 = 10，自处理 = 20 From 659693112462a65141f5514e61f054244dd5656f Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Thu, 10 Oct 2019 20:24:27 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 7a0e832..b5fb292 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -444,7 +444,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep queryString.append(" and a." + StringCastUtils.upperCharToUnderLine(propertyNames[i]) + "= '" + values[i]+"'"); } } - queryString.append(" group by a.lot_no,a.date_code"); + queryString.append(" group by a.lot_no,a.date_code,a.locate_no"); return entityManager.createNativeQuery(queryString.toString()).unwrap(SQLQuery.class).setResultTransformer( Transformers.ALIAS_TO_ENTITY_MAP).getResultList(); } From d11058019b7695a9211f88db613c70e47e23087b Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Thu, 10 Oct 2019 20:30:41 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index b5fb292..7a0e832 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -444,7 +444,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep queryString.append(" and a." + StringCastUtils.upperCharToUnderLine(propertyNames[i]) + "= '" + values[i]+"'"); } } - queryString.append(" group by a.lot_no,a.date_code,a.locate_no"); + queryString.append(" group by a.lot_no,a.date_code"); return entityManager.createNativeQuery(queryString.toString()).unwrap(SQLQuery.class).setResultTransformer( Transformers.ALIAS_TO_ENTITY_MAP).getResultList(); } From 982f8ad7419e14f799cf32ca57993824d524fef0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 10 Oct 2019 21:59:09 +0800 Subject: [PATCH 04/15] =?UTF-8?q?mes=E8=AE=BE=E7=BD=AE=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 2969233..f24ceee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -46,7 +46,8 @@ public class MesEquipmentModel implements Serializable { this.areaCode = areaCode; } - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { + public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { + this.wcId = wcId; this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; From 6c54f204b7fe9bd154c2910b75f61b46de8eb318 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 10 Oct 2019 23:25:14 +0800 Subject: [PATCH 05/15] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index f24ceee..85c2f18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -31,6 +31,9 @@ public class MesEquipmentModel implements Serializable { @ApiParam(value ="设备工位关联ID") private Long wcId; + @ApiParam(value ="设备代码&工位") + private String equipmentCodeAndworkCellCode; + public MesEquipmentModel() { } @@ -55,4 +58,15 @@ public class MesEquipmentModel implements Serializable { this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; } + + public MesEquipmentModel(Long id, String equipmentCodeAndworkCellCode, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { + this.id = id; + this.equipmentCodeAndworkCellCode = equipmentCodeAndworkCellCode; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.status = status; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + + } } From 926c9c3d60494bc68e4c7bfd38be85707ba22e73 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Fri, 11 Oct 2019 09:32:55 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=A7=BB=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 +- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 33 ---------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 3af7891..5fdefdd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -215,7 +215,7 @@ public interface BaseRepository extends JpaReposito List findByProperty(String propertyName, Object value); - List> findByWasProperty(String[] propertyNames, Object[] values); + List findByProperty(String[] propertyNames, Object[] values); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 7a0e832..6544d05 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -411,44 +411,11 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return query.setFirstResult(offset).setMaxResults(pageSize).getResultList(); } - @Override public List findByProperty(String propertyName, Object value) { String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; return entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); } - - @Override - public List> findByWasProperty(String[] propertyNames, Object[] values) { - if (propertyNames.length != values.length) { - throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); - } - StringBuffer queryString = new StringBuffer(); - queryString.append(" SELECT \n" + - " a.sn_status AS snStatus,\n" + - " a.wh_no AS whNo,\n" + - " a.locate_no AS locateNo,\n" + - " a.part_no AS partNo,\n" + - " a.part_name_rdd AS partNameRdd,\n" + - " a.lot_no AS lotNo,\n" + - " CAST(IFNULL(SUM(a.qty), 0) AS DOUBLE) AS qty \n" + - "FROM\n" + - " `wms_stock_sn` a "); - int size = propertyNames.length; - if (size > 0) { - queryString.append("where 1=1 and a.sn_status in ('"+ WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue()+"', '"+WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue()+"','"+WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue()+"','"+WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue()+"') "); - } - - for (int i = 0; i < size; i++) { - if (values[i] != null) { - queryString.append(" and a." + StringCastUtils.upperCharToUnderLine(propertyNames[i]) + "= '" + values[i]+"'"); - } - } - queryString.append(" group by a.lot_no,a.date_code"); - return entityManager.createNativeQuery(queryString.toString()).unwrap(SQLQuery.class).setResultTransformer( - Transformers.ALIAS_TO_ENTITY_MAP).getResultList(); - } - @Override public List findByProperty(String[] propertyNames, Object[] values) { if(propertyNames.length != values.length){ From 3ebf17adb1aaf0bfe071b155d47e41f62d74df09 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Fri, 11 Oct 2019 09:39:15 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 6544d05..936d73e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1550,6 +1550,4 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return num; } - - } From 658b25bd651ce8a75fcee15fb8a09c21a614bf5e Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Fri, 11 Oct 2019 09:46:11 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/util/StringCastUtils.java | 29 ++++++++-------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringCastUtils.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringCastUtils.java index 2a53a11..7a87e78 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringCastUtils.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringCastUtils.java @@ -7,30 +7,21 @@ import java.util.regex.Pattern; * 字符串转大写换成下滑线加小写 */ public class StringCastUtils { - public static String upperCharToUnderLine(String param) { - Pattern p= Pattern.compile("[A-Z]"); - if(param==null ||param.equals("")){ - return ""; - } - StringBuilder builder=new StringBuilder(param); - Matcher mc=p.matcher(param); - int i=0; - while (mc.find()) { - System.out.println(builder.toString()); - System.out.println("mc.start():" + mc.start() + ", i: " + i); - System.out.println("mc.end():" + mc.start() + ", i: " + i); - builder.replace(mc.start()+i, mc.end()+i, "_"+mc.group().toLowerCase()); - i++; + Pattern p= Pattern.compile("[A-Z]"); + if(param==null ||param.equals("")){ + return ""; + } + StringBuilder builder=new StringBuilder(param); + Matcher mc=p.matcher(param); + int i=0; + while (mc.find()) { + builder.replace(mc.start()+i, mc.end()+i, "_"+mc.group().toLowerCase()); + i++; } if('_' == builder.charAt(0)){ builder.deleteCharAt(0); } - System.out.println(builder.toString()); return builder.toString(); } - -// public static void main(String[] args) { -// upperCharToUnderLine("snStatus"); -// } } From abd2321850e29140904730e25c5306e2cfaf19ee Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Fri, 11 Oct 2019 10:08:44 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/iotio/WmsCSOrderDetailsModel.java | 61 +++++----------------- 1 file changed, 12 insertions(+), 49 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index 6e2b61d..56e9dab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -1,79 +1,42 @@ package cn.estsh.i3plus.pojo.wms.bean.iotio; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; @Data public class WmsCSOrderDetailsModel implements Serializable { - - - /****** - * - * 工厂代码 - */ + @ApiParam("工厂代码") public String organizeCode; - - /****** - * - * 库位编码 - */ + @ApiParam("库位编码") public String locateNo; - /****** - * - * 订单编码 - */ + @ApiParam("订单编号") public String orderNo; - - /****** - * - * 物料代码 - */ + @ApiParam("物料代码") public String partNo; - /****** - * - * 物料名称 - */ + @ApiParam("物料名称") public String partNameRdd; - /****** - * - * 冻结数量 - */ + @ApiParam("冻结数量") public String qty; - /****** - * - * 实盘数量 - */ + @ApiParam("实盘数量") public String factQty; - /****** - * - * 条码 - */ + @ApiParam("条码编号") public String sn; - - /****** - * - * 仓库编码 - */ + @ApiParam("仓库编码") public String whNo; - /****** - * - * 区域编码 - */ + @ApiParam("区域编码") public String zoneNo; - /****** - * - * 状态 - */ + @ApiParam("状态") public String wmStatus; } From 2a1274df654d9d8b1de684bab7207284aaf11f7d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Oct 2019 11:03:58 +0800 Subject: [PATCH 10/15] =?UTF-8?q?mes=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/MesEquipmentModel.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 85c2f18..cfe4f4d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -31,8 +31,8 @@ public class MesEquipmentModel implements Serializable { @ApiParam(value ="设备工位关联ID") private Long wcId; - @ApiParam(value ="设备代码&工位") - private String equipmentCodeAndworkCellCode; + @ApiParam(value ="设备&工位") + private String equipmentNameAndworkCellName; public MesEquipmentModel() { @@ -49,22 +49,13 @@ public class MesEquipmentModel implements Serializable { this.areaCode = areaCode; } - public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { - this.wcId = wcId; - this.id = id; - this.equipmentCode = equipmentCode; - this.equipmentName = equipmentName; - this.status = status; - this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; - } - - public MesEquipmentModel(Long id, String equipmentCodeAndworkCellCode, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode) { + public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) { this.id = id; - this.equipmentCodeAndworkCellCode = equipmentCodeAndworkCellCode; + this.equipmentNameAndworkCellName = equipmentNameAndworkCellName; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.status = status; + this.areaCode = areaCode; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; From 37e2a88ca7c38f842b6c683ecf1f0f88e9620e1c Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 11 Oct 2019 11:52:01 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E7=89=A9=E7=90=86=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E5=92=8C=E8=BD=AF=E4=BB=B6=E5=AE=89=E7=81=AF=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=99=84=E5=B1=9E=E8=A1=A8=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 6b6c9ad..431a96d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -456,6 +456,50 @@ public class AndonEnumUtil { return tmp; } } + /** + * 安灯操作动作来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_OPERATION_SOURCE{ + PHYSICAL("10","物理操作"), + SOFT("20","软件操作"); + + private String value; + private String description; + + ALARM_OPERATION_SOURCE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * 安灯来源 From 91fada5cc06895005e14a4eb80a030bbe2ba6631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 11 Oct 2019 20:24:21 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 9e9f331..318eba2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -600,7 +600,8 @@ public class WmsEnumUtil { QC(220, "QC", "QC"), AMPR(230, "AMPR", "AMPR"), FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"), - VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"); + VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"), + VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"); private int value; From 24a3b0e2b0e06cad65f2e185be396f0cd4fe0094 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Oct 2019 20:32:53 +0800 Subject: [PATCH 13/15] =?UTF-8?q?mes=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 ++ .../i3plus/pojo/mes/model/MesEquipmentModel.java | 51 ++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index f7f03b2..bdda980 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -79,6 +79,10 @@ public class MesEquipment extends BaseBean { @ApiParam("连接类型") private Integer connectType; + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + @Transient @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index cfe4f4d..2f34121 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -34,6 +34,37 @@ public class MesEquipmentModel implements Serializable { @ApiParam(value ="设备&工位") private String equipmentNameAndworkCellName; + @ApiParam("设备类型") + private Integer equipmentType; + + @ApiParam(value ="设备类别") + private String equipmentCategory; + + @ApiParam(value ="备注") + private String memo; + + @ApiParam(value ="设备型号") + private String equipmentModel; + + @ApiParam(value ="设备规格") + private String equipmentSpec; + + @ApiParam("制造商") + private String equipmentMaker; + + @ApiParam("出厂日期") + private String releaseDate; + + @ApiParam("接收日期") + private String receiveDate; + + @ApiParam("启用日期") + private String enableDate; + + @ApiParam("连接类型") + private Integer connectType; + + public MesEquipmentModel() { } @@ -60,4 +91,24 @@ public class MesEquipmentModel implements Serializable { this.workCellCode = workCellCode; } + + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.status = status; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.areaCode = areaCode; + this.equipmentType = equipmentType; + this.equipmentCategory = equipmentCategory; + this.memo = memo; + this.equipmentModel = equipmentModel; + this.equipmentSpec = equipmentSpec; + this.equipmentMaker = equipmentMaker; + this.releaseDate = releaseDate; + this.receiveDate = receiveDate; + this.enableDate = enableDate; + this.connectType = connectType; + } } From 096c02d42d28db095e0d6e02ec8412068f862004 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Oct 2019 20:36:41 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java index a804e6e..8f2872f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="MES_ACTION") -@Api("系统业务动作") +@Api("mes系统业务动作") public class MesAction extends BaseBean { @Column(name="ACTION_CODE") @ApiParam("动作代码") From db26628d9f7f1619a12cc43a45d84c39fc294221 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 11 Oct 2019 20:44:42 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonBroadCast.java | 76 ++++++++++++++++++++++ .../i3plus/pojo/andon/bean/AndonBroadCastCfg.java | 45 +++++++++++++ .../repository/IAndonBroadCastCfgRepository.java | 17 +++++ .../repository/IAndonBroadCastRepository.java | 17 +++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 30 +++++++++ 5 files changed, 185 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastCfgRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java new file mode 100644 index 0000000..dd0961b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.andon.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; + +/** + * @Description :安灯广播 + * @Reference : + * @Author : crish + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_BRODCAST") +@Api("安灯广播") +public class AndonBroadCast extends BaseBean { + @Column(name="DEVICE_NUM") + @ApiParam("广播设备编号") + private String targetIds; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name="DEVICE_DEC") + @ApiParam("广播设备名称") + private String deviceDec; + + @Column(name="DEVICE_IP") + @ApiParam("广播设备ip") + private String deviceIp; + + @Column(name="PLAY_INTERVAL") + @ApiParam("播放间隔") + private Integer playInterval = 0; + + @Column(name="PLAY_PRIORITY") + @ApiParam("播放优先级") + private Integer playPriority = 500; + + @Column(name="VOLUME") + @ApiParam("播放音量") + private Integer volume; + + @Column(name="TTS_NAME") + @ApiParam("广播语音引擎") + private String voiceEngine; + + @Column(name="TEXT_ENCODE") + @ApiParam("广播内容编码格式") + private String textEncode = "UTF-8"; + + @Column(name="PLAY_SPEED") + @ApiParam("播放语速") + private Integer playSpeed = 0; + + @Column(name="PLAY_TIME") + @ApiParam("播放循环次数") + private Integer playTime = 1; + + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java new file mode 100644 index 0000000..e5ecfff --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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.util.List; + +/** + * @Description :广播配置 + * @Reference : + * @Author : crish + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_BRODCAST_CFG") +@Api("生产区域") +public class AndonBroadCastCfg extends BaseBean { + @Column(name="ALARM_CODE") + @ApiParam("安灯类型代码") + private String alarmCode; + + @Column(name="DEVICE_NUM") + @ApiParam("广播设备编号") + private String targetIds; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastCfgRepository.java new file mode 100644 index 0000000..ce88422 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 安灯广播配置持久层 + * @Reference : + * @Author : crish + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface IAndonBroadCastCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastRepository.java new file mode 100644 index 0000000..0be6748 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonBroadCastRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 安灯广播持久层 + * @Reference : + * @Author : crish + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface IAndonBroadCastRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index d90de3f..fd44ca9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -80,6 +80,36 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean); return packBean; } + + /** + * 广播条件查询 + * @param andonBroadCast + * @return + */ + public static DdlPackBean getAndonBroadCast(AndonBroadCast andonBroadCast) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean); + DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean); + return packBean; + } + + /** + * 广播配置条件查询 + * @param andonBroadCastCfg + * @return + */ + public static DdlPackBean getAndonBroadCastCfg(AndonBroadCastCfg andonBroadCastCfg) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean); + return packBean; + } /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/