I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

Browse Source
yun-zuoyi
WYnneaoapc 6 years ago
parent 146cf768d6
commit 63c0f02f32
3 changed files with 38 additions and 54 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -908,6 +908,7 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMPANY_TYPE {
RULECODE("ruleCode","规则编码"),
PREFIX("prefix", "前缀"),
PART_NO("partNo", "物料号"),
CUST_PART_NO("custPartNo", "客户物料号"),

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
Unescape Escape View File

@ -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;

87
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -485,17 +485,18 @@ public class MesHqlPack {
* @param organizeCode
* @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,9 +507,9 @@ public class MesHqlPack {
return packBean;
}
public static DdlPackBean getMesEventByEventCode(String eventCode, String org) {
DdlPackBean packBean = getAllBaseData(org);
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;
}
@ -519,8 +520,8 @@ public class MesHqlPack {
return packBean;
}
public static DdlPackBean getMesActionExcludeById(MesAction mesAction, String org) {
DdlPackBean packBean = getAllBaseData(org);
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;
@ -530,19 +531,13 @@ public class MesHqlPack {
* 动作分页获取封装
*
* @param mesAction
* @param organizeCode
* @param
* @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;
@ -555,25 +550,18 @@ 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 = getAllBaseDataByNormalPro(mesMethod, organizeCode);
public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
}
@ -584,17 +572,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;
}

Write Preview
Loading…
Cancel
Save