【任务:1381】

yun-zuoyi
jokelone 5 years ago
parent c905343349
commit 51839d7be5

@ -13,6 +13,40 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil { public class MesEnumUtil {
/** /**
* -module
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_ACTION_MODULE {
WORK_ORDER_LANDED(10, "生产工单下达");
private int value;
private String description;
MES_ACTION_MODULE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
/**
* JIS * JIS
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -173,8 +173,6 @@ public class MesHqlPack {
mesWorkOrder.getCreateDateTimeEnd(), mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true); "createDatetime", packBean, true);
} }
DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean; return packBean;
} }
@ -205,9 +203,6 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
} }
DdlPreparedPack.getOrderDefault(mesPart);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
return packBean; return packBean;
} }

@ -32,4 +32,7 @@ public class ActionRequestBean<Obj> implements Serializable {
@ApiParam("Map请求集") @ApiParam("Map请求集")
public Map<String, Object> resultMap; public Map<String, Object> resultMap;
@ApiParam("module代码")
public Integer moduleCode;
} }

Loading…
Cancel
Save