|
|
@ -414,7 +414,7 @@ public class MesHqlPack {
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* MES 开线管控
|
|
|
|
* MES 开线管控
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param mesWcCheck
|
|
|
|
* @param wcCheck
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
|
|
|
|
public static DdlPackBean getMesWcCheck(MesWcCheck wcCheck, String organizeCode) {
|
|
|
@ -1838,11 +1838,11 @@ public class MesHqlPack {
|
|
|
|
if (mesProduceSn.getQcStatus() != null) {
|
|
|
|
if (mesProduceSn.getQcStatus() != null) {
|
|
|
|
DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
|
|
|
|
DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) {
|
|
|
|
if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
|
|
|
|
DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean);
|
|
|
|
DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) {
|
|
|
|
if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeStart())) {
|
|
|
|
DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean);
|
|
|
|
DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
|
|
|
|
// DdlPreparedPack.timeBuilder(
|
|
|
|
// DdlPreparedPack.timeBuilder(
|
|
|
|
// mesProduceSn.getOutWorkCenterStartTime(),
|
|
|
|
// mesProduceSn.getOutWorkCenterStartTime(),
|
|
|
|
// mesProduceSn.getOutWorkCenterEndTime(),
|
|
|
|
// mesProduceSn.getOutWorkCenterEndTime(),
|
|
|
@ -2021,6 +2021,12 @@ public class MesHqlPack {
|
|
|
|
if (mesProduceSnTravel.getQcStatus() != null) {
|
|
|
|
if (mesProduceSnTravel.getQcStatus() != null) {
|
|
|
|
DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean);
|
|
|
|
DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeStart())) {
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), "outWorkCenterTime", packBean);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
|
|
|
|
|
|
|
|
}
|
|
|
|
DdlPreparedPack.timeBuilder(
|
|
|
|
DdlPreparedPack.timeBuilder(
|
|
|
|
mesProduceSnTravel.getCreateDateTimeStart(),
|
|
|
|
mesProduceSnTravel.getCreateDateTimeStart(),
|
|
|
|
mesProduceSnTravel.getCreateDateTimeEnd(),
|
|
|
|
mesProduceSnTravel.getCreateDateTimeEnd(),
|
|
|
|