From d3be2fb6dfb3530334079e59d2c9f3c2a4cd5f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 15 May 2019 15:13:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ANDON=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 11 +++++++ .../bean/AndonManageRecord.java | 7 +++++ .../sqlpack/AndonHqlPack.java | 34 ++++++++++++++++++++++ 3 files changed, 52 insertions(+) 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 769d648..0d455ec 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 @@ -88,12 +88,23 @@ public class AndonManageQueue extends BaseBean { private Integer priorityLevel; @Column(name="CALL_TIME",updatable = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "呼叫时间") @AnnoOutputColumn(hidden = true) public String callTime; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间，查询开始时间") + public String callTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间，查询结束时间") + public String callTimeEnd; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String callTimeStr; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index bdc2403..5148f5a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -216,4 +216,11 @@ public class AndonManageRecord extends BaseBean { public Integer getPriorityLevel() { return this.priorityLevel == null ? 0 : this.priorityLevel; } + + public AndonManageRecord() { + } + + public AndonManageRecord(String andonOrderNo) { + this.andonOrderNo = andonOrderNo; + } } 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 cbdd59b..543a790 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 @@ -170,10 +170,44 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result); DdlPreparedPack.getInPackArray(obj, "statusCode", result); getStringBuilderPack(andonManageQueue, result); + if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){ + DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); + } + + // 根据优先级倒序，序号升序排序 + DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, + new String[]{"priorityLevel", "seq"}, result); + + return result; + } + + /** + * 按条件查询按灯记录信息 + * @param andonManageRecord + * @return + */ + public static DdlPackBean packHqlAndonManageRecord(AndonManageRecord andonManageRecord, Object[] obj){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(), "andonOrderNo", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getEquipmentCode(), "equipmentCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(), "actionCode", result); + DdlPreparedPack.getInPackArray(obj, "statusCode", result); + + getStringBuilderPack(andonManageRecord, result); + + // 根据优先级倒序，序号升序排序 + DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, + new String[]{"priorityLevel", "seq"}, result); + return result; } From aafa463afc68d46e79613d1243a5b6856b06ee68 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 15 May 2019 13:53:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E4=B8=8D=E5=A4=9F=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= 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, 1 insertion(+), 1 deletion(-) 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 ff23075..81adc82 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 @@ -55,7 +55,7 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") private String resourceKey; - @Column(name="resource_value") + @Column(name="resource_value",columnDefinition="TEXT") @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取") private String resourceValue; From 7db7dee50c697ed71d974973f42325aa8bf0d0fd Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Wed, 15 May 2019 16:23:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?sweb=20=E8=AE=A2=E5=8D=95=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=96=E5=AD=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 4 ---- .../cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 14 +++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index add54ef..fe4aff9 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -50,10 +50,6 @@ public class SwebPurchaseOrder extends BaseBean { @Column(name = "ORDER_TYPE") private Integer orderType; - @ApiParam(value = "订单状态", example = "1") - @Column(name = "ORDER_STATUS") - private Integer orderStatus; - @Column(name = "PARENT_PACKAGE_NO") @ApiParam("上级包装编号") private String parentPackageNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 47cea81..b6d87d0 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.sweb.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; @@ -46,7 +47,6 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); @@ -139,4 +139,16 @@ public class SwebHqlPack { DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } + + /** + * 判断订单详情表是否有非新建状态的订单 where sql + * @param details + * @return + */ + public static DdlPackBean getPODetailsNotCreateStatusWhereHql(SwebPurchaseOrderDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumNOEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); + return buildHql(details, result); + } }