From b06ecdd3f375cb22d85ada0c904bca2a34356774 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 18 Dec 2019 14:27:16 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[bug=EF=BC=9A7043=EF=BC=8CPCN=E8=8A=82?= =?UTF-8?q?=E7=82=B9-=E6=A8=A1=E5=9D=97=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/pcn/bean/MesPcn.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java | 3 +++ 3 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java index 818cbcb..247c8d9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -39,10 +39,18 @@ public class MesPcn extends BaseBean { @ApiParam("区域") private String areaCode; + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index 33f1de2..c98a0dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -39,10 +39,18 @@ public class MesPcn extends BaseBean { @ApiParam("区域") private String areaCode; + @Column(name = "AREA_NAME") + @ApiParam("区域") + private String areaName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心") + private String workCenterName; + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; 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 index 0e1a398..b8ede8d 100644 --- 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 @@ -50,6 +50,9 @@ public class MesPartObjectModel { @ApiParam("对象名称") private String objectName; + public MesPartObjectModel() { + } + 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; From 54fe0ce760e552b274e4f441dbb41baf119f5848 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 18 Dec 2019 16:28:09 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6360=20=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 +++++++--- 1 file changed, 7 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 efd4ce1..05e1da8 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 @@ -487,15 +487,19 @@ public class MesEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } // 根据value返回枚举类型,主要在switch中使用 public static ORGANIZATION_INIT_DATA getByValue(String value) { - for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) { - if (mesInsertExcel.getValue().equals(value)) { - return mesInsertExcel; + for (ORGANIZATION_INIT_DATA organizationInitData : values()) { + if (organizationInitData.getValue().equals(value)) { + return organizationInitData; } } return null; From fdfc5884c5217556108c82158fd531c46ebc2042 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 18 Dec 2019 17:08:56 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=90=20=09=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=98=E7=82=B9=EF=BC=88=E4=B8=A4=E4=B8=AA=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=89=E9=9C=80=E8=A6=81=E5=8F=AF=E4=BB=A5=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=BA=93=E4=BD=8D=E4=BB=A5=E5=90=8E=E7=AB=8B=E5=88=BB?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E3=80=82=E3=80=91=E3=80=90bug7040=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java index dc572b6..9330c69 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java @@ -21,4 +21,7 @@ public class WmsCSOrderMasterModel implements Serializable { @ApiParam("工厂代码") public String organizeCode; + + @ApiParam("确认框") + public Boolean confirm; } From 423b81609a6146607bc8f00232d5df6980510bdd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 18 Dec 2019 18:05:24 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1198?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 59 +++++++++------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 80 +++++++++++++--------- 2 files changed, 82 insertions(+), 57 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index d7a6052..6eea3a5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -155,18 +155,24 @@ public class MesHqlPack { } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getCreateDateTimeStart(), - mesWorkOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; @@ -290,32 +296,35 @@ public class MesHqlPack { */ public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); - if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { + if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); } - if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) { + if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); } - if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) { + if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); } - if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) { + if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - DdlPreparedPack.timeBuilder( - mesProduceSn.getOutWorkCenterTimeStart(), - mesProduceSn.getOutWorkCenterTimeEnd(), - "outWorkCenterTime", packBean, true); - + if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterTimeStart(), + mesProduceSn.getOutWorkCenterTimeEnd(), + "outWorkCenterTime", packBean, true); + } return packBean; } 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 6b938ee..b9eb3ec 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 @@ -84,18 +84,24 @@ public class MesHqlPack { } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesPlanOrder.getStartTimeStart(), - mesPlanOrder.getStartTimeEnd(), - "startTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesPlanOrder.getEndTimeStart(), - mesPlanOrder.getEndTimeEnd(), - "endTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesPlanOrder.getCreateDateTimeStart(), - mesPlanOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesPlanOrder.getStartTimeStart(), + mesPlanOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesPlanOrder.getEndTimeStart(), + mesPlanOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesPlanOrder.getCreateDateTimeStart(), + mesPlanOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } // 排序 DdlPreparedPack.getOrderDefault(mesPlanOrder); @@ -180,18 +186,24 @@ public class MesHqlPack { } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getCreateDateTimeStart(), - mesWorkOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; @@ -1713,14 +1725,18 @@ public class MesHqlPack { if (mesCustOrder.getStatus() != null) { DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean); } - DdlPreparedPack.timeBuilder( - mesCustOrder.getOrderTimeStart(), - mesCustOrder.getOrderTimeEnd(), - "orderDate", packBean, true); - DdlPreparedPack.timeBuilder( - mesCustOrder.getCreateDateTimeStart(), - mesCustOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(mesCustOrder.getOrderTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getOrderTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesCustOrder.getOrderTimeStart(), + mesCustOrder.getOrderTimeEnd(), + "orderDate", packBean, true); + } + if (!StringUtils.isEmpty(mesCustOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesCustOrder.getCreateDateTimeStart(), + mesCustOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } return packBean; } From 04533633363ff41135698b3f8f3e341d3fe6ade5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 18 Dec 2019 21:59:55 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E3=80=90=E5=8F=91=E8=BF=90=E9=85=8D?= =?UTF-8?q?=E6=96=99=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=B0=86=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=95=B0=E9=87=8F=E6=94=B9=E4=B8=BA=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E9=85=8D=E6=96=99=E6=95=B0=E9=87=8F=E3=80=82=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E3=80=91bug7063?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 +++++++++++++++++++++- 1 file changed, 35 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 87050ca..390532b 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 @@ -110,6 +110,7 @@ public class WmsEnumUtil { /** * 移库单主表：优先级 */ + @Deprecated @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRIORITY { NORMAL(1, "正常"), URGENT(2, "紧急"); @@ -142,6 +143,38 @@ public class WmsEnumUtil { /** + * 移库单主表：优先级 (PRIORITY_NEW) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRIORITY_NEW { + URGENT(1, "紧急"), NORMAL(2, "正常"); + private int value; + private String description; + + PRIORITY_NEW(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + /** * 主表信息 单据类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -205,7 +238,8 @@ public class WmsEnumUtil { RECEIPT(20, "RECEIPT", "处理中"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), CLOSED(40, "CLOSED", "已关闭"), - CANCELLED(50, "CANCELLED", "已取消"); + CANCELLED(50, "CANCELLED", "已取消"), + FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成"); private int value; private String code; From 339f1a86c275ef7725ddff3ede03f6c2147303f1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 Dec 2019 09:16:15 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E9=97=B4=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 13 +++++++++---- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 8 -------- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 5 ----- 3 files changed, 9 insertions(+), 17 deletions(-) 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 b05d85c..a18d99a 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 @@ -730,6 +730,10 @@ public class AndonEnumUtil { /** * 按灯标识 * 1-呼叫，2-签到，3-解决 + * + * 20190917将“提交”更改为“解决待审” + * 20190917将“审批”更改为“审批完成” + * 20190917增加"撤销已确认"枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_TAG { @@ -737,10 +741,10 @@ public class AndonEnumUtil { SIGN(2,"20","响应"), RESOLVE(3,"30","解决"), CANCEL(4,"40", "撤销"), - COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审” - PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成” + COMMIT(5,"50","解决待审"), + PASS(6,"60","审批完成"), REJECT(7,"70","驳回"), - CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举 + CONFIRMED_CANCEL(8,"80","撤销已确认"); private int value; private String code; @@ -944,10 +948,11 @@ public class AndonEnumUtil { /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 + * + * 下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - //下面的顺序不要更改，packBrokenTimeTypeRatioList方法有用到此枚举的顺序 EQUIP("EQUMENT_ALARM", 110060106, "设备", "#D06D6A"), QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), PART("PART_ALARM", 110060104, "物料", "#24BDBA"), 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 0d04f5e..a22ef11 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 @@ -495,7 +495,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static ORGANIZATION_INIT_DATA getByValue(String value) { for (ORGANIZATION_INIT_DATA organizationInitData : values()) { if (organizationInitData.getValue().equals(value)) { @@ -1488,7 +1487,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_INSERT_EXCEL getByValue(int value) { for (MES_INSERT_EXCEL mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1647,7 +1645,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1846,7 +1843,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_WORK_CELL_TYPE getByValue(int value) { for (MES_WORK_CELL_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1904,7 +1900,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -1952,7 +1947,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_BIND_KEY getByValue(int value) { for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -2000,7 +1994,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_REPAIR_STATUS getByValue(int value) { for (MES_REPAIR_STATUS mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -2051,7 +2044,6 @@ public class MesEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { 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 988baf8..ecda007 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 @@ -75,7 +75,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -193,7 +192,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_ACTION_TYPE getByValue(int value) { for (MES_ACTION_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -281,7 +279,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_IS_BIND_KEY getByValue(int value) { for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -405,7 +402,6 @@ public class MesPcnEnumUtil { return description; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_OPERATE_TYPE getByValue(int value) { for (MES_OPERATE_TYPE mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { @@ -466,7 +462,6 @@ public class MesPcnEnumUtil { return tmp; } - // 根据value返回枚举类型,主要在switch中使用 public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { if (mesMatchType.getValue() == value) { From b674087ffc69b0d8e3eb375e3198fcecae8b204e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 19 Dec 2019 13:53:13 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=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/base/enumutil/CommonEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 46172c2..f55c898 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -146,11 +146,12 @@ public class CommonEnumUtil { } return null; } - public static int descriptionOfValue(String desc) { + public synchronized static int descriptionOfValue(String desc) { int tmp = IMPP.value; for (int i = 0; i < values().length; i++) { - if (values()[i].name().equals(desc)) { + if (values()[i].description.equals(desc)) { tmp = values()[i].value; + break; } } return tmp; From 5c28c8344c733644dda55886376ac1a3bcc15960 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 15:09:19 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=E3=80=91?= 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 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 2 files changed, 3 insertions(+), 2 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 390532b..617148e 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 @@ -1349,7 +1349,8 @@ public class WmsEnumUtil { INVENTORY(20, "已盘"), FROZEN(30, "已冻结"), THAWING(40, "已解冻"), - RETURN_GOODS(50, "取消冻结"); + RETURN_GOODS(50, "取消冻结"), + Unsettled_(60, "取消冻结"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 3b6b4bc..21af5a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer destSnStatus; /** - * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") From 0d7e64b160627a79be6d96e57818a6a9459f3966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Dec 2019 16:22:21 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=9C=A8=E8=B0=83=E7=94=A8=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=8A=8A=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E4=B8=80=E5=B9=B6=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E5=88=B0MOVEMASTER=E5=AF=B9=E8=B1=A1=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=9C=81=E5=8E=BB=E6=AF=8F=E4=B8=AA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E5=86=8D=E5=8E=BB=E5=BE=AA=E7=8E=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 45 +++++++++------------- .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 6 ++- 3 files changed, 24 insertions(+), 29 deletions(-) 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 e4a35f8..be7ffe3 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 @@ -204,7 +204,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "循环补货数量", example = "0") private Double cycleRquestQty = 0d; - public int getIqcValue(){ + public int getIqcVal(){ return this.iqc == null ? 0 : this.iqc.intValue(); } 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 7ae45fb..811158c 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 @@ -79,49 +79,40 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "可用数量", example = "0") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "可用数量") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "不合格数量", example = "0") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "不合格数量") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "隔离数量", example = "0") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "隔离数量") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "质检中数量", example = "0") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "质检中数量") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "待入库数量", example = "0") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "待入库数量") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "冻结数量", example = "0") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "冻结数量") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "寄售数量", example = "0") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "寄售数量") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "锁定数量", example = "0") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "锁定数量") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "报废数量", example = "0") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "报废数量") private Double scrapQty; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index aef6850..c6caa7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -58,7 +58,7 @@ public class WmsTransType extends BaseBean { private String transTypeDesc; @Column(name = "TM_ID") - @ApiParam(value = "交易处理组件", example = "-1") + @ApiParam(value = "交易处理组件") @JsonSerialize(using = ToStringSerializer.class) private Long tmId; @@ -73,4 +73,8 @@ public class WmsTransType extends BaseBean { public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } + + public long getTmIdVal() { + return this.tmId == null ? 0 : this.tmId; + } }