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 1083bf7..1022a46 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 @@ -12,6 +12,82 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes按钮状态配置 判断符号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_BUTTON_STATUS_JUDGE_FLAG { + + EQUAL("=", "等于"), + NOT_EQUAL("!=", "不等于"), + GREATER_THAN(">", "大于"), + NOT_LESS_THAN(">=", "大于大于"), + LESS_THAN("<", "小于"), + NOT_GREATER_THAN("<=", "小于等于"); + + private String value; + private String description; + + MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * mes按钮状态配置 逻辑符号 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_BUTTON_STATUS_LOGIC_FLAG { + + AND("&&", "逻辑与"), + OR("||", "逻辑或"); + + private String value; + private String description; + + MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** * MesWorkOrder实体对应的approvalStatus值 审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -554,7 +630,7 @@ public class MesEnumUtil { } /** - * MesPlanOrder实体对应的source值 计划来源 + * MesWorkOrder实体对应的source值 计划来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_ORDER_SOURCE { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java similarity index 53% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 1f1d8c2..02745c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -14,7 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :mes状态配置表 + * @Description :mes按钮状态配置表 * @Reference : * @Author : wangjie * @CreateDate : 2019-09-19 @@ -25,26 +25,36 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_STATUS") -@Api("系统业务动作") -public class MesStatus extends BaseBean { - @Column(name="STATUS_CODE") - @ApiParam("状态代码") - private String statusCode; +@Table(name="MES_BUTTON_STATUS") +@Api("按钮状态配置表") +public class MesButtonStatus extends BaseBean { - @Column(name="STATUS_NAME") - @ApiParam("状态名称") - private String statusName; + @Column(name="BUTTON_CODE") + @ApiParam("按钮代码") + private String buttonCode; - @Column(name="STATUS_VALUE") - @ApiParam("状态值") - private Integer statusValue; + @Column(name="CLASS_NAME") + @ApiParam("实体类名称") + private String ClassName; @Column(name="STATUS_FIELD") @ApiParam("状态字段") private String statusField; - public int getStatusValueVal() { - return this.statusValue == null ? 0 : this.statusValue; - } + @Column(name="JUDGE_FLAG") + @ApiParam("判断符合") + private String judgeFlag; + + @Column(name="STATUS_VALUE") + @ApiParam("状态值") + private String statusValue; + + @Column(name="LOGIC_FLAG") + @ApiParam("逻辑符合") + private String logicFlag; + + @Column(name="STATUS_DESC") + @ApiParam("描述") + private String statusDesc; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 13a3217..b22729f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -187,6 +187,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("mes生产工单页面按钮控制") private MesWorkOrderButtonModel workOrderButtonModel; + @Transient + @ApiParam(value="下达按钮编号") + public String buttonCode; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.java new file mode 100644 index 0000000..5b33393 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesButtonStatusRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesButtonStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description :按钮条件配置 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Repository +public interface MesButtonStatusRepository extends BaseRepository { + +} 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 0ee655a..7fc2765 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 @@ -1215,4 +1215,19 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } + + /** + * 按钮条件配置 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode); + if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) { + DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean); + } + packBean.setOrderByStr(buttonStatus.orderBy()); + return packBean; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index a90feda..e6ba0ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -106,8 +106,7 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("ERP库存地") private String erpWhNo; - @Column(name="SN_STATUS") - @ApiParam(value = "状态", example = "10") + @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; }