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

【任务：1381 兼容Sql server】

Browse Source
yun-zuoyi
jokelone 5 years ago
parent 5a24a08c00
commit 0a70a42336
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File

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

@ -58,6 +58,9 @@ public class MesEquTaskPlanModel implements Serializable {
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("修改日期")
public String modifyDatetimePlan;
@ApiParam("作业类型名称")
private String taskTypeName;
@ -69,7 +72,7 @@ public class MesEquTaskPlanModel implements Serializable {
}
public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -87,5 +90,6 @@ public class MesEquTaskPlanModel implements Serializable {
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.modifyDatetimePlan = modifyDatetimePlan;
}
}

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

@ -55,6 +55,9 @@ public class MesEquTaskStandardModel implements Serializable {
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("修改日期")
public String modifyDatetimeStandard;
@ApiParam("作业类型")
private String taskTypeName;
@ -66,7 +69,10 @@ public class MesEquTaskStandardModel implements Serializable {
}
public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem,
String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory,
String organizeCode, Integer isValid, Integer isDeleted, String createUser,
String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -83,5 +89,6 @@ public class MesEquTaskStandardModel implements Serializable {
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.modifyDatetimeStandard = modifyDatetimeStandard;
}
}

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

@ -102,10 +102,6 @@ public class MesHqlPack {
mesPlanOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
// 排序
DdlPreparedPack.getOrderDefault(mesPlanOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPlanOrder.getOrderByParam()}, packBean);
return packBean;
}
@ -141,8 +137,6 @@ public class MesHqlPack {
} else {
DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean);
}
DdlPreparedPack.getOrderDefault(mesPart);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
return packBean;
}
@ -205,7 +199,6 @@ public class MesHqlPack {
"createDatetime", packBean, true);
}
DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean;
}
@ -243,8 +236,6 @@ public class MesHqlPack {
"createDatetime", packBean, true);
// DdlPreparedPack.getOrderDefault(mesQueueOrder);
// 按照队列序列号倒序
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{"seq"}, packBean);
return packBean;
}
@ -321,7 +312,6 @@ public class MesHqlPack {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean);
packBean.setOrderByStr(mesRoute.orderBy());
return packBean;
}
@ -337,7 +327,6 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
packBean.setOrderByStr(mesProdRouteCfg.orderBy());
return packBean;
}
@ -1163,8 +1152,6 @@ public class MesHqlPack {
if (null != numberRule.getIsCycle()) {
DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);
}
packBean.setOrderByStr(numberRule.orderBy());
return packBean;
}
@ -1183,7 +1170,6 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) {
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
}
packBean.setOrderByStr(mesPcnTask.orderBy());
return packBean;
}
@ -1230,7 +1216,6 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(buttonStatus.getButtonCode())) {
DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean);
}
packBean.setOrderByStr(buttonStatus.orderBy());
return packBean;
}

Write Preview
Loading…
Cancel
Save