From 5144d15ac4a3a57da563c16e4231109f2f17d72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 10 Sep 2019 16:03:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 11 +++-- 2 files changed, 61 insertions(+), 3 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 1eae9c3..69cb407 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 @@ -3339,4 +3339,57 @@ public class WmsEnumUtil { } } + /** + * 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REC_STATUS{ + UNRECEIVED("UNRECEIVED", "未收货"), + COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"), + PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"), + OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"), + OTHER("ELSE", "其他"),; + + private String value; + private String description; + + REC_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + + public static String getDes(String 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 String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(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/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index a4e4142..22f00de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,6 +43,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer asnStatus; @Column(name = "VENDOR_NO") @@ -65,6 +68,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") public Integer isTask; @ApiParam("ASN详情列表") @@ -129,7 +133,7 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("物料名称") - private String partNoNameRdd; + private String partNameRdd; @Transient @ApiParam("收货数量") @@ -165,6 +169,7 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("收货状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description") private String recStatus; @Transient @@ -173,7 +178,7 @@ public class WmsASNMaster extends BaseBean { public WmsASNMaster(){} - public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNoNameRdd, + public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd, Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType, String recStatus){ @@ -181,7 +186,7 @@ public class WmsASNMaster extends BaseBean { this.asnStatus = asnStatus; this.vendorNo = vendorNo; this.partNo = partNo; - this.partNoNameRdd = partNoNameRdd; + this.partNameRdd = partNameRdd; this.sumQty = sumQty; this.sumRecQty = sumRecQty; this.planDate = planDate; From 58d6305bd3d31b1c72ec0db47a31c639c279f785 Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 10 Sep 2019 16:35:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?mes=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 9c3a317..0fa4064 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 @@ -542,7 +542,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesAction(MesAction mesAction) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction.getOrganizeCode()); + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, mesAction.getOrganizeCode()); DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean); DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean); @@ -1182,4 +1182,17 @@ public class MesHqlPack { } return packBean; } + + /** + * 系统业务动作 + * @param organizeCode + * @return + */ + public static DdlPackBean getMesActionAllData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } } From 8ed0d4d60e34572ed1958dfe101822da67605229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 10 Sep 2019 16:54:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE?= 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 | 4 +++- 1 file changed, 3 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 1eae9c3..7fe95a1 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 @@ -717,7 +717,9 @@ public class WmsEnumUtil { OUTSTOCK("OUTSTOCK", "出库"), INSTOCK("INSTOCK", "入库"), MOVESTOCK("MOVESTOCK", "移库"), - CS("CS", "盘点"); + CS("CS", "盘点"), + VDARC("VDARC", "VDA收货"); + private String value; private String description; From 262f7efe05baa1730123375c62eab5873a35ccb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 10 Sep 2019 17:02:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E9=9C=80=E8=A6=81=E5=8F=A0=E5=8A=A0?= =?UTF-8?q?=E5=9C=A8=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E5=89=8D=E4=B8=80?= =?UTF-8?q?=E8=B5=B7=E8=BF=94=E5=9B=9E=E7=BB=99=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 9ef9648..40edbf5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -41,6 +41,9 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("总步数") public int totalStep; + @ApiParam("错误提示信息") + public String errorMsg; + @ApiParam("提示信息") public String message; @@ -49,14 +52,16 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("可选项") public List options; - public List getOptions(){ - if(options == null){ + + public List getOptions() { + if (options == null) { options = new ArrayList<>(); } return options; } - public void setOptions(List opt){ - if(opt == null){ + + public void setOptions(List opt) { + if (opt == null) { opt = new ArrayList<>(); } options = opt;