From 48338fec28468fe4548bf4fb369487eddc6c16bf Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 12 Dec 2019 20:20:16 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=20task=20`1300`=205=20BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 91b8786..a1585c7 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 @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.math.BigDecimal; /** * @Description: @@ -154,6 +155,14 @@ public class MesProduceSn extends BaseBean { @ApiParam("条码类型名称") private String snTypeName; + public MesProduceSn() { + } + + public MesProduceSn(String partNo, Integer qcStatus, Double qty) { + this.partNo = partNo; + this.qcStatus = qcStatus; + this.qty = qty; + } public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From 3bfb0995d51179174904d664534b6b998492b5ba Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 12 Dec 2019 20:35:11 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E3=80=90=E8=B4=B5?= =?UTF-8?q?=E9=87=8D=E7=89=A9=E6=96=99=E3=80=91=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E9=A2=86=E6=96=99=E4=B8=8A=E7=BA=BF=E6=B5=81=E7=A8=8B=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=AD=A4=E5=B1=9E=E6=80=A7=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=9C=80=E8=A6=81=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=20=E3=80=91bug1299?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 37 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 +++ 2 files changed, 42 insertions(+) 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 50a5461..a7ceeff 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 @@ -3023,6 +3023,8 @@ public class WmsEnumUtil { } } + + /** * 任务数据来源：检查子数据 */ @@ -4565,4 +4567,39 @@ public class WmsEnumUtil { } } + + /** + * 是否贵重物料 + * 默认为2 + */ + public enum IS_VALUABLE { + TRUE(1, "贵重物料"), FALSE(2, "非贵重物料"); + + private int value; + private String description; + + IS_VALUABLE(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; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 1d2e6b8..e4a35f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -170,6 +170,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "待质检比例", example = "1") private Double proportion; + @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") + @ApiParam(value = "贵重物料") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") + private Integer isValuable; + @Transient @ApiParam("总数量") private Double qty; From 8a2e4134ed70606d1b35925a67736d0e3509e6b8 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 13 Dec 2019 09:41:25 +0800 Subject: [PATCH 03/11] =?UTF-8?q?[mes=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 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 93443f9..2f47d7f 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 @@ -1426,7 +1426,10 @@ public class MesEnumUtil { MES_PART_OJBECT(340,"物料对象"), MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"), MES_DATASOURCE(360,"DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370,"设备通知配置"); + MES_EQU_TASK_NOTIFY_CFG(370,"设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), + MES_PLC(390,"PLC地址清单"); + private int value; private String description; From ee14ce1d4b17a7bfdd9dfe59402998bfebac07e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 13 Dec 2019 09:41:44 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=90KT-=E5=BF=AB=E9=80=9F=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8A=9F=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/WmsEnumUtil.java | 106 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 98 ++++++++++--------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 35 +++++++ 3 files changed, 196 insertions(+), 43 deletions(-) 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 99d9bdd..426f54b 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 @@ -4545,4 +4545,110 @@ public class WmsEnumUtil { } } + /** + * 计划拉动明细表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_DETAILS_STATUS { + BE_HANDLE(10,"BE_HANDLE", "待处理"), + CANCELLATION(20,"CANCELLATION", "已处理"); + + private int value; + private String code; + private String description; + + PULL_TASK_DETAILS_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 计划拉动明细表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PULL_TASK_MASTER_STATUS { + CREATE(10,"CREATE", "创建"), + ENABLED(20,"ENABLED", "已启动"), + COMPLETE(30,"COMPLETE", "已完成"), + CLOSE(40,"CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + PULL_TASK_MASTER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index 09f05c2..b2e4e34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") - private String woekorderNo; + private String wrokorderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") @@ -47,8 +47,8 @@ public class WmsPullTaskDetails extends BaseBean{ private String locateNo; @Column(name="LOCATE_CAPACITY") - @ApiParam("库位容量") - private String locateCapacity; + @ApiParam(value = "库位容量", example = "0") + private Integer locateCapacity = 0; @Column(name="PART_NO") @ApiParam("零件编号") @@ -58,49 +58,53 @@ public class WmsPullTaskDetails extends BaseBean{ @ApiParam("零件名称") private String partNameRdd; + @Column(name="PLAN_PACK_QTY") + @ApiParam(value = "计划数量", example = "0d") + private Double planPackQty = 0d; + @Column(name="PLAN_PACK_COUNT") - @ApiParam(value = "计划容器数", example = "0") - private Integer planPackCount = 0; + @ApiParam(value = "计划容器数", example = "0d") + private Double planPackCount = 0d; @Column(name="FIRST_BATCH_QTY") - @ApiParam(value = "首批批量", example = "0") - private Integer firstBatchQty = 0; + @ApiParam(value = "首批批量", example = "0d") + private Double firstBatchQty = 0d; @Column(name="FIRST_PACK_COUNT") - @ApiParam(value = "首批容器数", example = "0") - private Integer firstPackCount = 0; + @ApiParam(value = "首批容器数", example = "0d") + private Double firstPackCount = 0d; @Column(name="REQUEST_QTY") - @ApiParam(value = "补货批量", example = "0") - private Integer requestQty = 0; + @ApiParam(value = "补货批量", example = "0d") + private Double requestQty = 0d; @Column(name="REQUEST_PACK_COUNT") - @ApiParam(value = "补货容器数", example = "0") - private Integer requestPackCount = 0; + @ApiParam(value = "补货容器数", example = "0d") + private Double requestPackCount = 0d; @Column(name="REQUEST_LOT_NO") - @ApiParam(value = "补货批次", example = "0") - private Integer requestLotNo = 0; + @ApiParam(value = "补货批次", example = "0d") + private Double requestLotNo = 0d; @Column(name="REQUEST_TOTAL_COUNT") - @ApiParam(value = "补货累加次数", example = "0") - private Integer requestTotalCount = 0; + @ApiParam(value = "补货累加次数", example = "0d") + private Double requestTotalCount = 0d; @Column(name="LAST_REQUEST_TIME") @ApiParam("上一次补货时间") private String lastRequestTtime; @Column(name="BOOT_QTY") - @ApiParam(value = "尾箱批量", example = "0") - private Integer bootQty = 0; + @ApiParam(value = "尾箱批量", example = "0d") + private Double bootQty = 0d; @Column(name="BOOT_PACK_COUNT") - @ApiParam(value = "尾箱容器数", example = "0") - private Integer bootPackCount = 0; + @ApiParam(value = "尾箱容器数", example = "0d") + private Double bootPackCount = 0d; @Column(name="BOOT_LOT_NO") - @ApiParam(value = "尾箱批次", example = "0") - private Integer bootLotNo = 0; + @ApiParam(value = "尾箱批次", example = "0d") + private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") @ApiParam(value = "单据状态", example = "0") @@ -110,48 +114,56 @@ public class WmsPullTaskDetails extends BaseBean{ return orderStatus == null ? 0 : this.orderStatus.intValue(); } - public Integer getBootLotNo() { - return bootLotNo == null ? 0 : this.bootLotNo.intValue(); + public Double getBootLotNo() { + return bootLotNo == null ? 0d : this.bootLotNo.doubleValue(); } - public Integer getBootPackCount() { - return bootPackCount == null ? 0 : this.bootPackCount.intValue(); + public Double getBootPackCount() { + return bootPackCount == null ? 0d : this.bootPackCount.doubleValue(); } - public Integer getBootQty() { - return bootQty == null ? 0 : this.bootQty.intValue(); + public Double getBootQty() { + return bootQty == null ? 0d : this.bootQty.doubleValue(); } - public Integer getRequestTotalCount() { - return requestTotalCount == null ? 0 : this.requestTotalCount.intValue(); + public Double getRequestTotalCount() { + return requestTotalCount == null ? 0d : this.requestTotalCount.doubleValue(); } - public Integer getRequestLotNo() { - return requestLotNo == null ? 0 : this.requestLotNo.intValue(); + public Double getRequestLotNo() { + return requestLotNo == null ? 0d : this.requestLotNo.doubleValue(); } - public Integer getRequestPackCount() { - return requestPackCount == null ? 0 : this.requestPackCount.intValue(); + public Double getRequestPackCount() { + return requestPackCount == null ? 0d : this.requestPackCount.doubleValue(); } - public Integer getRequestQty() { - return requestQty == null ? 0 : this.requestQty.intValue(); + public Double getRequestQty() { + return requestQty == null ? 0d : this.requestQty.doubleValue(); } - public Integer getFirstPackCount() { - return firstPackCount == null ? 0 : this.firstPackCount.intValue(); + public Double getFirstPackCount() { + return firstPackCount == null ? 0d : this.firstPackCount.doubleValue(); } - public Integer getFirstBatchQty() { - return firstBatchQty == null ? 0 : this.firstBatchQty.intValue(); + public Double getFirstBatchQty() { + return firstBatchQty == null ? 0d : this.firstBatchQty.doubleValue(); } - public Integer getPlanPackCount() { - return planPackCount == null ? 0 : this.planPackCount.intValue(); + public Double getPlanPackCount() { + return planPackCount == null ? 0d : this.planPackCount.doubleValue(); } public Integer getItem() { return item == null ? 0 : this.item.intValue(); } + public Double getLocateCapacity() { + return locateCapacity == null ? 0d : this.locateCapacity.doubleValue(); + } + + public Double getPlanPackQty() { + return planPackQty == null ? 0d : this.planPackQty.doubleValue(); + } + } \ No newline at end of file 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 3c3d128..a6cff4a 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 @@ -2611,4 +2611,39 @@ public class WmsHqlPack { return result; } + /** + * 拉动计划主表信息分页查询条件 + * + * @param wmsPullTaskMaster + * @return + */ + public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getInPack(statusList, "orderStatus", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); + DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); + DdlPreparedPack.getStringSmallerPack(wmsPullTaskMaster.getEndProductTime(), "endProductTime", result); + + getStringBuilderPack(wmsPullTaskMaster, result); + + return result; + } + + /** + * 拉动计划明细表信息分页查询条件 + * + * @param wmsPullTaskDetails + * @return + */ + public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsPullTaskDetails, result); + + return result; + } + } From 586dfb416b79fff93d91c8b4ab169a4edd0dff92 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 13 Dec 2019 09:57:35 +0800 Subject: [PATCH 05/11] =?UTF-8?q?[mes=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/MesEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 91d933f..4ba381d 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 @@ -1461,7 +1461,9 @@ public class MesEnumUtil { MES_PART_OJBECT(340, "物料对象"), MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"); + MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), + MES_PLC(390,"PLC地址清单"); private int value; private String description; From bc61b43e8dcfd62f99e637428db9bcdede61d489 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 13 Dec 2019 11:14:36 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=B7=A5=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index ea05280..5f6df39 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -338,9 +338,10 @@ public class AndonManageQueue extends BaseManageQueue { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ + public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ this.organizeCode = organizeCode; this.workCenterNameRdd = workCenterNameRdd; + this.workCellCode = workCellCode; this.workCellNameRdd = workCellNameRdd; this.resetUser = resetUser; this.alarmCode = alarmCode; From 3902fb6309560d476d83fcaeef19760ed3092874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 13 Dec 2019 12:39:53 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index be1fccc..01fd23c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -49,6 +49,7 @@ public class SysLocaleResource extends BaseBean { @Column(name="language_code") @ApiParam(value = "语言编码",example = "浏览器语言编码") + @AnnoOutputColumn private String languageCode; @Column(name="language_name_rdd") @@ -57,6 +58,7 @@ public class SysLocaleResource extends BaseBean { @Column(name="resource_key") @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") + @AnnoOutputColumn private String resourceKey; @Lob From b3a04911b6ce91cb8787621da97a371cadc5dbcc Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 13 Dec 2019 13:59:46 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=20task=20`1300`=205=20BI=20=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 5 +++ 3 files changed, 47 insertions(+), 3 deletions(-) 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 4ba381d..2d6168e 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 @@ -276,7 +276,8 @@ public class MesEnumUtil { DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), - QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"); + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), + WC_CHECK("WC_CHECK", "开线检查项"); private String value; private String description; @@ -1462,8 +1463,8 @@ public class MesEnumUtil { MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), - MES_PLC(390,"PLC地址清单"); + MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), + MES_PLC(390, "PLC地址清单"); private int value; private String description; 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 cf5ea6e..8f6f9c2 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 @@ -214,7 +214,45 @@ public class MesPcnEnumUtil { } } + /** + * MES_TYPE_CFG 类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG { + + DEFECT("DEFECT", "缺陷"), + DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), + REPAIR("REPAIR", "处理措施"), + SCRAP("SCRAP", "报废原因"), + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), + WC_CHECK("WC_CHECK", "开线检查项"); + + private String value; + private String description; + + MES_TYPE_CFG(String value, String description) { + this.value = value; + this.description = description; + } + + public String 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.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * MesProdBindRecord 是否是关键件 */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java index 6dc2133..43f7f49 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -36,6 +36,8 @@ public class WcCheckModel { private List materials; @ApiParam("物料 列") private Map materialsColumn; + @ApiParam("普通列") + private Map commonColumn; @ApiParam("法") private List routes; @@ -66,6 +68,9 @@ public class WcCheckModel { @ApiParam("需要展示的数据") private Map need2ShowMap; + @ApiParam("重构map") + private Map> showMap; + public WcCheckModel initialWcCheckModel() { WcCheckModel wcCheckModel = new WcCheckModel(); From 7bc434ed15eb0a9168dff1565a53cd3f421faf6c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 13 Dec 2019 14:47:51 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java index 30d3683..0533141 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java @@ -67,6 +67,6 @@ public class MesWorkCell extends BaseBean { private String workCellType; public String getName(){ - return this.workCellName; + return this.workCellCode; } } From da4f32f0b4310274db47c6cc82157e1dbcf4b1a6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 13 Dec 2019 17:42:52 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E3=80=90=E5=9C=A8=E9=85=8D=E6=96=99?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=EF=BC=8C=E8=BE=93=E5=85=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E6=98=BE=E7=A4=BA=E7=9A=84=E5=86=85=E5=AE=B9=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E6=9D=A5=E6=BA=90=EF=BC=8C=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E7=B4=A7=E6=80=A5=20=E3=80=916978?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 83788f2..99eb8af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -99,6 +99,7 @@ public class WmsDocMovementMaster extends BaseBean { public Integer isTask; @Column(name = "PRIORITY") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRIORITY.class, refForeignKey = "value", value = "description") @ApiParam(value = "优先级", example = "1") public Integer priority; From b9b30cf19c8353c7523dc68107469cf64343ae0f Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 13 Dec 2019 18:07:30 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1306?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A0=87=E5=87=86=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/base/util/StringUtil.java | 22 +++++++ .../estsh/i3plus/pojo/mes/bean/MesPartObject.java | 8 +-- .../i3plus/pojo/mes/model/MesPartObjectModel.java | 67 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 ++++++++ 4 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 46af027..95bfee7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -3,7 +3,11 @@ package cn.estsh.i3plus.pojo.base.util; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class StringUtil { @@ -65,4 +69,22 @@ public class StringUtil { return null; } } + + private static Pattern linePattern = Pattern.compile("_(\\w)"); + + /** 驼峰转下划线 */ + public static Map humpToLine(Map map) { + Map resultMap = new HashMap<>(); + for (String str : map.keySet()) { + str = str.toLowerCase(); + Matcher matcher = linePattern.matcher(str); + StringBuffer sb = new StringBuffer(); + while (matcher.find()) { + matcher.appendReplacement(sb, matcher.group(1).toUpperCase()); + } + matcher.appendTail(sb); + resultMap.put(sb.toString(), map.get(str)); + } + return resultMap; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index 0dc5011..0bac54e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -37,10 +37,6 @@ public class MesPartObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") - @ApiParam("物料名称") - private String objectName; - @Column(name = "WORK_CENTER_CODE") @ApiParam("生产线") private String workCenterCode; @@ -60,4 +56,8 @@ public class MesPartObject extends BaseBean { @Transient @ApiParam("数据组号") private String groupNo; + + @Transient + @ApiParam("对象名称") + private String objectName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java new file mode 100644 index 0000000..0e1a398 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\13 14:33 + * @Modify: + **/ +@Data +public class MesPartObjectModel { + + private Long id; + + @ApiParam(value ="组织代码") + private String organizeCode; + + @ApiParam(value = "创建用户") + private String createUser; + + @ApiParam(value = "创建日期") + private String createDatetime; + + @ApiParam(value = "修改人") + private String modifyUser; + + @ApiParam(value = "修改日期") + private String modifyDatetime; + + @ApiParam(value = "有效性",example = "1") + private Integer isValid; + + @ApiParam(value = "是否已删除",example = "2") + private Integer isDeleted; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("对象名称") + private String objectName; + + public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.partNo = partNo; + this.objectCode = objectCode; + this.workCenterCode = workCenterCode; + this.objectName = objectName; + } +} 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 c96c3ce..6b938ee 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 @@ -2057,4 +2057,28 @@ public class MesHqlPack { } return packBean; } + + /** + * 质量标准配置 + * + * @param qualityStandardCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQualityStandardCfg(MesQualityStandardCfg qualityStandardCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(qualityStandardCfg, organizeCode); + if (!StringUtils.isEmpty(qualityStandardCfg.getStandardType())) { + DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getStandardType(), "standardType", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKey())) { + DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKey(), "objectKey", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectType())) { + DdlPreparedPack.getNumEqualPack(qualityStandardCfg.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(qualityStandardCfg.getObjectKeyValue())) { + DdlPreparedPack.getStringLikerPack(qualityStandardCfg.getObjectKeyValue(), "objectKeyValue", packBean); + } + return packBean; + } }