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 cd2e4c1..1be5a75 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 @@ -236,16 +236,18 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLAN_ORDER_STATUS { - CREATE(10, "创建"), - DE_COMPOSE_ING(20, "分解中"), - DE_COMPOSE_ED(30, "分解完成"), - CLOSE(40, "关闭"); + CREATE(10, "CREATED", "创建"), + DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"), + DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"), + CLOSE(40, "CLOSE", "关闭"); private int value; + private String code; private String description; - PLAN_ORDER_STATUS(int value, String description) { + PLAN_ORDER_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -253,6 +255,10 @@ public class MesEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -904,7 +910,7 @@ public class MesEnumUtil { public enum CONFIG_TYPE { FASTDFS_SAVE_PATH(10, "savePath"), - NGINX_IP(20,"nginxIp"); + NGINX_IP(20, "nginxIp"); private int value; private String description; @@ -976,6 +982,7 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMPANY_TYPE { + RULECODE("ruleCode","规则编码"), PREFIX("prefix", "前缀"), PART_NO("partNo", "物料号"), CUST_PART_NO("custPartNo", "客户物料号"), 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 f324149..1d4ade8 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 @@ -1168,6 +1168,42 @@ public class WmsEnumUtil { } } + /** + * 库存移动单明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVE_ORDER_DETAILS_STATUS { + CREATE(10, "创建"), + BE_HANDLE(20, "待处理"), + FINISH(30, "已处理"); + + private int value; + private String description; + + MOVE_ORDER_DETAILS_STATUS(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; + } + } + /** * 质检业务类型 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 7d68ab1..07c9423 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -22,7 +22,7 @@ import javax.persistence.Column; @NoArgsConstructor @AllArgsConstructor @Api("生成条码模型") -public class GenSerialNoModel extends BaseBean { +public class GenSerialNoModel { @ApiParam("规则代码") private String ruleCode; @@ -43,7 +43,7 @@ public class GenSerialNoModel extends BaseBean { private String prodLocation; @ApiParam("前缀") - private Integer prefix; + private String prefix; @ApiParam("编码规则") private String numberRule; @@ -67,4 +67,8 @@ public class GenSerialNoModel extends BaseBean { private String currentNumber; + public GenSerialNoModel(String ruleCode){ + this.ruleCode=ruleCode; + } + } 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 e268aaf..d77941e 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 @@ -454,7 +454,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) { - DdlPackBean packBean = getAllBaseDataByNormalPro(org); + DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean); @@ -482,20 +482,21 @@ public class MesHqlPack { * 事件分页获取封装 * * @param mesEvent - * @param organizeCode + * @param * @return */ - public static DdlPackBean getMesEvent(MesEvent mesEvent, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesEvent, organizeCode); - if (StringUtils.isNotEmpty(mesEvent.getButtonCode())) { - DdlPreparedPack.getStringLikerPack(mesEvent.getButtonCode(), "buttonCode", packBean); - } - if (StringUtils.isNotEmpty(mesEvent.getEventCode())) { - DdlPreparedPack.getStringLikerPack(mesEvent.getEventCode(), "eventCode", packBean); - } - if (StringUtils.isNotEmpty(mesEvent.getEventName())) { - DdlPreparedPack.getStringLikerPack(mesEvent.getEventName(), "eventName", packBean); - } + public static DdlPackBean getMesEvent(MesEvent mesEvent) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEvent, mesEvent.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesEvent.getButtonCode(), "buttonCode", packBean); + DdlPreparedPack.getStringLikerPack(mesEvent.getEventCode(), "eventCode", packBean); + DdlPreparedPack.getStringLikerPack(mesEvent.getEventName(), "eventName", packBean); + return packBean; + } + + public static DdlPackBean getMesEventExcludeById(MesEvent mesEvent) { + DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesEvent.getEventCode(), "eventCode", packBean); + DdlPreparedPack.getNumNOEqualPack(mesEvent.getId(), "id", packBean); return packBean; } @@ -506,40 +507,36 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesEventByEventCode(String eventCode, String org) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(org, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean); + public static DdlPackBean getMesEventByEventCode(MesEvent mesEvent) { + DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesEvent.getEventCode(), "eventCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean); return packBean; } + public static DdlPackBean getMesActionExcludeById(MesAction mesAction) { + DdlPackBean packBean = getAllBaseData(mesAction.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean); + DdlPreparedPack.getNumNOEqualPack(mesAction.getId(), "id", packBean); + return packBean; + } /** * 动作分页获取封装 * * @param mesAction - * @param organizeCode * @return */ - public static DdlPackBean getMesAction(MesAction mesAction, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); - if (StringUtils.isNotEmpty(mesAction.getActionCode())) { - DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean); - } - - if (StringUtils.isNotEmpty(mesAction.getActionName())) { - DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); - } - + public static DdlPackBean getMesAction(MesAction mesAction) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction.getOrganizeCode()); + DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean); + DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean); return packBean; @@ -552,28 +549,19 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesMethod(MesMethod mesMethod, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode); - if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) { - DdlPreparedPack.getStringRightLikerPack(mesMethod.getMethodCode(), "methodCode", packBean); - } - if (StringUtils.isNotEmpty(mesMethod.getMethodName())) { - DdlPreparedPack.getStringLikerPack(mesMethod.getMethodName(), "methodName", packBean); - } - if (StringUtils.isNotEmpty(mesMethod.getCallClass())) { - DdlPreparedPack.getStringRightLikerPack(mesMethod.getCallClass(), "callClass", packBean); - } - if (mesMethod.getMethodType() != null && StringUtils.isNotEmpty(mesMethod.getMethodType() + "")) { - DdlPreparedPack.getStringEqualPack(mesMethod.getMethodType() + "", "methodType", packBean); - } + public static DdlPackBean getMesMethod(MesMethod mesMethod) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode()); + DdlPreparedPack.getStringRightLikerPack(mesMethod.getMethodCode(), "methodCode", packBean); + DdlPreparedPack.getStringLikerPack(mesMethod.getMethodName(), "methodName", packBean); + DdlPreparedPack.getStringRightLikerPack(mesMethod.getCallClass(), "callClass", packBean); + DdlPreparedPack.getStringEqualPack(mesMethod.getMethodType() + "", "methodType", packBean); + return packBean; } - public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod, String organizeCode) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean); + public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean); return packBean; } @@ -581,17 +569,12 @@ public class MesHqlPack { * 事件动作分页获取封装 * * @param mesActionMethod - * @param organizeCode * @return */ - public static DdlPackBean getMesActionMethod(MesActionMethod mesActionMethod, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionMethod, organizeCode); - if (StringUtils.isNotEmpty(mesActionMethod.getActionCode())) { - DdlPreparedPack.getStringLikerPack(mesActionMethod.getActionCode(), "actionCode", packBean); - } - if (StringUtils.isNotEmpty(mesActionMethod.getMethodCode())) { - DdlPreparedPack.getStringLikerPack(mesActionMethod.getMethodCode(), "methodCode", packBean); - } + public static DdlPackBean getMesActionMethod(MesActionMethod mesActionMethod) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesActionMethod, mesActionMethod.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesActionMethod.getActionCode(), "actionCode", packBean); + DdlPreparedPack.getStringLikerPack(mesActionMethod.getMethodCode(), "methodCode", packBean); return packBean; } @@ -863,7 +846,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) { - DdlPackBean packBean = getAllBaseDataByNormalPro(org); + DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); @@ -1136,6 +1119,7 @@ public class MesHqlPack { /** * Mes条码生成规则 + * * @param numberRule * @param organizeCode * @return @@ -1161,23 +1145,19 @@ public class MesHqlPack { /** * mes-pcn定时任务清单 + * * @param mesPcnTask * @param organizeCode * @return */ public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); - if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) { - DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); - } - if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) { - DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); - } + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); if (null != mesPcnTask.getTaskStatus()) { DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean); } packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } - }