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

Jenkins自动合并

Browse Source
yun-zuoyi
jenkins 5 years ago
parent 83d0f64a6c 423b81609a
commit d4e0c94c03
4 changed files with 92 additions and 60 deletions
Show Stats Download Patch File Download Diff File

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

@ -487,15 +487,19 @@ public class MesEnumUtil {
return value; return value;
} }
public String getCode() {
return code;
}
public String getDescription() { public String getDescription() {
return description; return description;
} }
// 根据value返回枚举类型,主要在switch中使用 // 根据value返回枚举类型,主要在switch中使用
public static ORGANIZATION_INIT_DATA getByValue(String value) { public static ORGANIZATION_INIT_DATA getByValue(String value) {
for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) { for (ORGANIZATION_INIT_DATA organizationInitData : values()) {
if (mesInsertExcel.getValue().equals(value)) { if (organizationInitData.getValue().equals(value)) {
return mesInsertExcel; return organizationInitData;
} }
} }
return null; return null;

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

@ -155,18 +155,24 @@ public class MesHqlPack {
} }
// 时间段查询 // 时间段查询
DdlPreparedPack.timeBuilder( if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
mesWorkOrder.getStartTimeStart(), DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeEnd(), mesWorkOrder.getStartTimeStart(),
"startTime", packBean, true); mesWorkOrder.getStartTimeEnd(),
DdlPreparedPack.timeBuilder( "startTime", packBean, true);
mesWorkOrder.getEndTimeStart(), }
mesWorkOrder.getEndTimeEnd(), if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
"endTime", packBean, true); DdlPreparedPack.timeBuilder(
DdlPreparedPack.timeBuilder( mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getCreateDateTimeStart(), mesWorkOrder.getEndTimeEnd(),
mesWorkOrder.getCreateDateTimeEnd(), "endTime", packBean, true);
"createDatetime", packBean, true); }
if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getCreateDateTimeStart(),
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean; return packBean;
@ -290,32 +296,35 @@ public class MesHqlPack {
*/ */
public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) {
DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode());
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
} }
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) { if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
} }
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) { if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
} }
if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) { if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
} }
// 时间段查询 // 时间段查询
DdlPreparedPack.timeBuilder( if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
mesProduceSn.getCreateDateTimeStart(), DdlPreparedPack.timeBuilder(
mesProduceSn.getCreateDateTimeEnd(), mesProduceSn.getCreateDateTimeStart(),
"createDatetime", packBean, true); mesProduceSn.getCreateDateTimeEnd(),
DdlPreparedPack.timeBuilder( "createDatetime", packBean, true);
mesProduceSn.getOutWorkCenterTimeStart(), }
mesProduceSn.getOutWorkCenterTimeEnd(), if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
"outWorkCenterTime", packBean, true); DdlPreparedPack.timeBuilder(
mesProduceSn.getOutWorkCenterTimeStart(),
mesProduceSn.getOutWorkCenterTimeEnd(),
"outWorkCenterTime", packBean, true);
}
return packBean; return packBean;
} }

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

@ -84,18 +84,24 @@ public class MesHqlPack {
} }
// 时间段查询 // 时间段查询
DdlPreparedPack.timeBuilder( if (!StringUtil.isEmpty(mesPlanOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getStartTimeEnd())) {
mesPlanOrder.getStartTimeStart(), DdlPreparedPack.timeBuilder(
mesPlanOrder.getStartTimeEnd(), mesPlanOrder.getStartTimeStart(),
"startTime", packBean, true); mesPlanOrder.getStartTimeEnd(),
DdlPreparedPack.timeBuilder( "startTime", packBean, true);
mesPlanOrder.getEndTimeStart(), }
mesPlanOrder.getEndTimeEnd(), if (!StringUtil.isEmpty(mesPlanOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getEndTimeEnd())) {
"endTime", packBean, true); DdlPreparedPack.timeBuilder(
DdlPreparedPack.timeBuilder( mesPlanOrder.getEndTimeStart(),
mesPlanOrder.getCreateDateTimeStart(), mesPlanOrder.getEndTimeEnd(),
mesPlanOrder.getCreateDateTimeEnd(), "endTime", packBean, true);
"createDatetime", packBean, true); }
if (!StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesPlanOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesPlanOrder.getCreateDateTimeStart(),
mesPlanOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
// 排序 // 排序
DdlPreparedPack.getOrderDefault(mesPlanOrder); DdlPreparedPack.getOrderDefault(mesPlanOrder);
@ -180,18 +186,24 @@ public class MesHqlPack {
} }
// 时间段查询 // 时间段查询
DdlPreparedPack.timeBuilder( if (!StringUtil.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getStartTimeEnd())) {
mesWorkOrder.getStartTimeStart(), DdlPreparedPack.timeBuilder(
mesWorkOrder.getStartTimeEnd(), mesWorkOrder.getStartTimeStart(),
"startTime", packBean, true); mesWorkOrder.getStartTimeEnd(),
DdlPreparedPack.timeBuilder( "startTime", packBean, true);
mesWorkOrder.getEndTimeStart(), }
mesWorkOrder.getEndTimeEnd(), if (!StringUtil.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getEndTimeEnd())) {
"endTime", packBean, true); DdlPreparedPack.timeBuilder(
DdlPreparedPack.timeBuilder( mesWorkOrder.getEndTimeStart(),
mesWorkOrder.getCreateDateTimeStart(), mesWorkOrder.getEndTimeEnd(),
mesWorkOrder.getCreateDateTimeEnd(), "endTime", packBean, true);
"createDatetime", packBean, true); }
if (!StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
mesWorkOrder.getCreateDateTimeStart(),
mesWorkOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean; return packBean;
@ -1713,14 +1725,18 @@ public class MesHqlPack {
if (mesCustOrder.getStatus() != null) { if (mesCustOrder.getStatus() != null) {
DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean); DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean);
} }
DdlPreparedPack.timeBuilder( if (!StringUtils.isEmpty(mesCustOrder.getOrderTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getOrderTimeEnd())) {
mesCustOrder.getOrderTimeStart(), DdlPreparedPack.timeBuilder(
mesCustOrder.getOrderTimeEnd(), mesCustOrder.getOrderTimeStart(),
"orderDate", packBean, true); mesCustOrder.getOrderTimeEnd(),
DdlPreparedPack.timeBuilder( "orderDate", packBean, true);
mesCustOrder.getCreateDateTimeStart(), }
mesCustOrder.getCreateDateTimeEnd(), if (!StringUtils.isEmpty(mesCustOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesCustOrder.getCreateDateTimeEnd())) {
"createDatetime", packBean, true); DdlPreparedPack.timeBuilder(
mesCustOrder.getCreateDateTimeStart(),
mesCustOrder.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean; return packBean;
} }

3
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
Unescape Escape View File

@ -21,4 +21,7 @@ public class WmsCSOrderMasterModel implements Serializable {
@ApiParam("工厂代码") @ApiParam("工厂代码")
public String organizeCode; public String organizeCode;
@ApiParam("确认框")
public Boolean confirm;
} }

Write Preview
Loading…
Cancel
Save