From 994da92b4e197feae41724b5eded4b154845e2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 2 Jul 2019 18:51:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E5=86=BB=E7=BB=93=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=9BstockQuan=E6=B7=BB=E5=8A=A0getVal?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 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 9bba3de..5355046 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 @@ -1082,7 +1082,8 @@ public class WmsEnumUtil { CREATE(10, "创建"), BE_HANDLE(20, "待处理"), FINISH(30, "已处理"), - HANDLE_ERROR(40, "处理出错"); + HANDLE_ERROR(40, "处理出错"), + TEST(50, "调试"); private int value; private String description; @@ -2693,7 +2694,7 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), - AMP("AMP","AMP系统"); + AMP("AMP", "AMP系统"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 73a9619..0c5cb4c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -122,39 +122,39 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; - public Double getQty() { + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } - public Double getFailQty() { + public Double getFailQtyVal() { return this.failQty == null ? 0 : this.failQty; } - public Double getHoldQty() { + public Double getHoldQtyVal() { return this.holdQty == null ? 0 : this.holdQty; } - public Double getQcQty() { + public Double getQcQtyVal() { return this.qcQty == null ? 0 : this.qcQty; } - public Double getRinQty() { + public Double getRinQtyVal() { return this.rinQty == null ? 0 : this.rinQty; } - public Double getFreezeQty() { + public Double getFreezeQtyVal() { return this.freezeQty == null ? 0 : this.freezeQty; } - public Double getConsignQty() { + public Double getConsignQtyVal() { return this.consignQty == null ? 0 : this.consignQty; } - public Double getLockQty() { + public Double getLockQtyVal() { return this.lockQty == null ? 0 : this.lockQty; } - public Double getScrapQty() { + public Double getScrapQtyVal() { return this.scrapQty == null ? 0 : this.scrapQty; } From 9dc634d63ee94d1a64e75f4d2bd67c55c392de23 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 2 Jul 2019 19:47:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=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/sqlpack/CoreHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 9b24ccb..e68b624 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -381,6 +381,7 @@ public class CoreHqlPack { // And X = X HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); @@ -491,6 +492,7 @@ public class CoreHqlPack { // And HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); // HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result); // HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result); HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); From 172fc81bee75f7d786b71f039c373b82bb46b562 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Tue, 2 Jul 2019 20:06:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?bug=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/wms/bean/WmsStockQuan.java | 11 ++++++++++- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 73a9619..60c4e87 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -122,6 +122,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; + @Transient + @ApiParam(value = "总数量") + private Double totalQty; + public Double getQty() { return this.qty == null ? 0 : this.qty; } @@ -158,11 +162,16 @@ public class WmsStockQuan extends BaseBean { return this.scrapQty == null ? 0 : this.scrapQty; } + public Double getTotalQty() { + return this.totalQty == null ? 0 : this.totalQty; + } + public WmsStockQuan() { } public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) { + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; 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 f1c64dd..0d9a204 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 @@ -412,7 +412,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + if(wmsLocate.getZoneNo() != null){ + DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result); + } + + // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result); From 073393a5b152604a5acd1c12ddb88007f55d9f86 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Tue, 2 Jul 2019 20:18:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug=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/wms/bean/WmsStockQuan.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 0c5cb4c..4c690e0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -122,6 +122,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; + @Transient + @ApiParam(value = "总数量") + private Double totalQty; + public Double getQtyVal() { return this.qty == null ? 0 : this.qty; } @@ -158,6 +162,10 @@ public class WmsStockQuan extends BaseBean { return this.scrapQty == null ? 0 : this.scrapQty; } + public Double getTotalVal() { + return this.totalQty == null ? 0 : this.totalQty; + } + public WmsStockQuan() { } From d3deaa60815c710eb81c262342cd803c4271d44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 2 Jul 2019 21:24:27 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=89=E7=81=AFbug=E8=A7=A3=E5=86=B3=201?= =?UTF-8?q?.=E6=93=8D=E4=BD=9C=E8=AF=A6=E6=83=85=E4=B8=AD=E4=B8=80?= =?UTF-8?q?=E7=9B=B4=E5=90=8C=E4=B8=80=E4=B8=AA=E5=B7=A5=E4=BD=8D=E5=90=8C?= =?UTF-8?q?=E7=A7=8D=E5=91=BC=E5=8F=AB=E5=90=8C=E4=B8=80=E4=B8=AA=E5=91=BC?= =?UTF-8?q?=E5=8F=AB=E5=8D=95=E4=BB=BB=E5=8A=A1=E6=9C=89=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=202.PLC=EF=BC=9A=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=9C=B0=E5=9D=80=E3=80=81=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A4=B1?= =?UTF-8?q?=E6=95=88=203.=E9=80=9A=E7=9F=A5=E5=AF=B9=E8=B1=A1=EF=BC=9A?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=AF=B9=E8=B1=A1=E5=80=BC=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=204.=E9=80=9A=E7=9F=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8=E3=80=82=205.=E4=BA=8B=E4=BB=B6=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=EF=BC=9A=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 46 +++++++++++++++++++++- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 22 +++++++---- 2 files changed, 58 insertions(+), 10 deletions(-) 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 1575b05..902b0bc 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 @@ -120,7 +120,7 @@ public class AndonHqlPack { } /** - * 按条件查询ANDON呼叫原因 + * 按条件查询ANDON呼叫原因,== * @param andonAlarmCause * @return */ @@ -134,6 +134,22 @@ public class AndonHqlPack { return result; } + /** + * 按条件模糊查询ANDON呼叫原因, + * @param andonAlarmCause + * @return + */ + public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result); + + getStringBuilderPack(andonAlarmCause, result); + + return result; + } /** * 按条件查询ANDON事件处理方法 @@ -439,6 +455,11 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result); + DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result); + getStringBuilderPack(andonEventCause, result); return result; @@ -487,8 +508,29 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonPLC(AndonPLC plc) { DdlPackBean result = new DdlPackBean(); - getStringBuilderPack(plc, result); + DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result); + DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result); + + getStringBuilderPack(plc, result); return result; } + + /** + * 检查安灯记录是否以存在 + * @param andonManageRecord + * @return + */ + public static DdlPackBean packHqlAndonManageRecordIsExist(AndonManageRecord andonManageRecord){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(),"andonOrderNo", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getStatusCode(),"statusCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(),"alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(),"actionCode", result); + + getStringBuilderPack(andonManageRecord, result); + return result; + } } 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 6dc423e..9788e06 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 @@ -242,25 +242,31 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - PART("PART_ALARM","物料"), - QUALITY("QUALITY_ALARM","质量"), - EQUIP("EQUMENT_ALARM","设备"), - PROCESS("ROUTING_ALARM","工艺"), - CHECK("OTHER_ALARM","其他"), - FIX_ERROR("FIX_ERROR", "自动报警"); + PART("PART_ALARM", 111020005, "物料"), + QUALITY("QUALITY_ALARM", 111020006, "质量"), + EQUIP("EQUMENT_ALARM", 111020007, "设备"), + PROCESS("ROUTING_ALARM", 111020008, "工艺"), + CHECK("OTHER_ALARM", 111020009, "其他"), + FIX_ERROR("FIX_ERROR", 111020010, "自动报警"); private String value; + private Integer code; private String description; - ALARM_TYPE(String value, String description) { + ALARM_TYPE(String value, Integer code, String description) { this.value = value; + this.code = code; this.description = description; } - public String getValue() { + public String getValue() { return value; } + public Integer getCode() { + return code; + } + public String getDescription() { return description; } From 78cfff1748dd37740122c8fe6b2102cd806dbe59 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 2 Jul 2019 22:33:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8A=9F=E8=83=BD=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/platform/bean/SysOrganize.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index 96fa22a..fbbfbe2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -59,6 +59,10 @@ public class SysOrganize extends BaseBean { @ApiParam(value ="组织描述") private String organizeDescription; + @Column(name="ORGANIZE_ADDRESS") + @ApiParam(value ="组织地址") + private String organizeAddress; + @Column(name="ORGANIZE_SORT") @ApiParam(value ="排序" , example ="1") private Integer organizeSort;