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 f7fc675..32e0d77 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 @@ -399,4 +399,30 @@ public class AndonHqlPack { return result; } + + /** + * 安灯类型查询条件封装 + * @param andonAlarmType + * @return + */ + public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) { + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(andonAlarmType, result); + + return result; + } + + /** + * 安灯状态查询条件封装 + * @param andonStatus + * @return + */ + public static DdlPackBean packAndonStatus(AndonStatus andonStatus) { + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(andonStatus, 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 1c0f803..ca940ea 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 @@ -56,7 +56,7 @@ public class AndonEnumUtil { SECOND_APPROVAL("20","二级审批"), THIRD_APPROVAL("30","三级审批"), FOUTH_APPROVAL("40","四级审批"), - FINISH("100","已审批"); + FINISH("60","已审批"); private String value; private String description; @@ -200,18 +200,18 @@ public class AndonEnumUtil { /** * 按灯动作标志 - * 10 = 呼叫，20 = 签到，30 = 撤销，40 = 解决，50 = 转呼 ,60 = 提交，70 = 审批 + * 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_FLAG{ CALL_ACTION("10","呼叫动作"), SIGN_ACTION("20","签到动作"), - CANCEL_ACTION("30", "撤销动作"), - RESOLVE_ACTION("40", "解决动作"), - SHIFG_CALL_ACTION("50", "转呼动作"), - COMMIT_ACTION("60","提交动作"), - PASS_ACTION("70","审批动作"); + RESOLVE_ACTION("30", "解决动作"), + CANCEL_ACTION("40", "撤销动作"), + COMMIT_ACTION("50","提交动作"), + PASS_ACTION("60","审批动作"), + SHIFG_CALL_ACTION("70", "转呼动作"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 895a4a9..f68a09e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -335,7 +335,7 @@ public class BlockFormEnumUtil { } } /** - * 元素显示状态信息 + * 元素属性显示状态信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ELEMENT_SHOW_STATUS { @@ -2036,4 +2036,85 @@ public class BlockFormEnumUtil { } } + /** + * 元素树方向 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_TREE_DIRECTION { + horizontal(1, "horizontal", "横向"), + vertical(2, "vertical", "竖向"); + + private int value; + private String code; + private String description; + + private ELEMENT_TREE_DIRECTION (int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(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 ELEMENT_TREE_DIRECTION valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } 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 43adf39..46454dd 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 @@ -113,6 +113,7 @@ public class CommonEnumUtil { /** * 处理标识 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRUE_OR_FALSE { TRUE(1, "是"), FALSE(2, "否"); diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 01ad207..4e27e99 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -45,11 +45,11 @@ public class BfElementPropertyVirtual extends BaseBean { private Long dataObjectId; @Column(name="PROPERTY_CODE") - @ApiParam(value ="类属性代码") + @ApiParam(value ="虚拟属性代码") private String propertyCode; @Column(name="PROPERTY_NAME") - @ApiParam(value ="元素名称") + @ApiParam(value ="虚拟属性名称") private String propertyName; @Column(name="PROPERTY_TYPE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 28ddb48..cf9215a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -56,6 +56,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("条码") public String sn; + @Column(name="CSN") + @ApiParam("客户条码") + public String csn; + /** * 状态:1=创建,10=待处理,20=已处理 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 0704421..55e0b3f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -44,6 +44,10 @@ public class WmsZones extends BaseBean { @ApiParam(value = "存储区名称") private String zoneName; + @Column(name = "PARENT_ZONE_NO") + @ApiParam(value = "上层存储区") + private String parentZoneNo; + @Column(name = "IS_PM") @ApiParam(value = "零件级管控" , example = "2") private Integer isPm;