From ce70994a571e49eb1d3d86701d1482729e39b7da Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 21 Aug 2019 15:44:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=98=E7=82=B9=20=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82=E7=B1=BB=E5=9E=8B=E6=B1=87?= =?UTF-8?q?=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++ 2 files changed, 60 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 2f70a65..203bbce 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 @@ -3189,4 +3189,57 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 盘点差异类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INVENTORY_DIFFERENCE_TYPE { + INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"), + INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), + INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"); + + private int value; + private String code; + private String description; + + INVENTORY_DIFFERENCE_TYPE(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/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index ee10f50..55c1a73 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 @@ -116,6 +116,13 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("源单位") public String srcUnit; + /** + * 差异类型：10：盘平，20：盘亏，30盘赢 + */ + @Transient + @ApiParam("差异类型") + public String differenceType; + public Double getQty() { return this.qty == null ? 0 : this.qty; } From dd418f8b51eda3bf2c5828bb5bd0457029a44245 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 21 Aug 2019 17:03:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=80=E7=BA=BF=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 393f698..d1a06e2 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; @@ -17,6 +18,19 @@ import org.apache.commons.lang3.StringUtils; **/ public class AndonHqlPack { /** + * genju 安灯队列参数查询安灯队列 + * @param andonManageQueue + * @return + */ + public static DdlPackBean getAndonQueuePack(AndonManageQueue andonManageQueue, String statusCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(statusCode, "statusCode", packBean); + return packBean; + } + /** * 封装公用查询参数 * * @param bean 实体对象 From 1328dc7ddd32fec725ea64220fa1b3760abe5d70 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 21 Aug 2019 18:30:09 +0800 Subject: [PATCH 3/3] #Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 22 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 3 +++ .../pojo/mes/model/FastDfsDownloadModel.java | 5 ++++- 4 files changed, 31 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 15a7e6d..08f41a9 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 @@ -757,8 +757,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CONFIG_TYPE { - FASTDFS_SAVE_PATH(10, "savePath"); - + FASTDFS_SAVE_PATH(10, "savePath"), + NGINX_IP(20,"nginxIp"); private int value; private String description; 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 e5253fc..655ffd0 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 @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; +import org.apache.commons.lang3.StringUtils; /** * @Description: @@ -26,4 +28,24 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); return packBean; } + + /** + * MES PCN系统配置信息条件查询 + * + * @param mesConfig + * @return + */ + public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); + } + if (StringUtils.isNotEmpty(mesConfig.getCfgName())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); + } + if (mesConfig.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 193c0fb..bcc0fc2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; @@ -65,10 +66,12 @@ public class MesPlanOrder extends BaseBean { private Integer status; @Column(name="START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam("计划开始时间") private String startTime; @Column(name="END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam("计划结束时间") private String endTime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java index bef0a34..0e0da69 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java @@ -26,6 +26,9 @@ public class FastDfsDownloadModel { private String fileName; @ApiParam("文件字节") - private byte[] fileByte; + private String fileByte; + + @ApiParam("文件url") + private String url; }