diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index b3eaebc..973555a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -147,23 +147,23 @@ public class MesWorkOrder extends BaseBean { public String prodCfgName; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") public String startTimeStart; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") public String endTimeStart; @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") public String endTimeEnd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 02349f5..648be8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -75,7 +75,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean); } if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) { - DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean); + DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } // 时间段查询 @@ -161,7 +161,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } if (mesWorkOrder.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); @@ -345,7 +345,7 @@ public class MesHqlPack { public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); if (StringUtils.isNotEmpty(shift.getShiftCode())) { - DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); + DdlPreparedPack.getStringLikerPack(shift.getShiftCode(), "shiftCode", packBean); } if (StringUtils.isNotEmpty(shift.getShiftName())) { DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); @@ -451,7 +451,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); } if (StringUtils.isNotEmpty(mesESOP.getPartNo())) { - DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean); } return packBean; @@ -603,7 +603,7 @@ public class MesHqlPack { public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode); if (StringUtils.isNotEmpty(process.getProcessCode())) { - DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean); + DdlPreparedPack.getStringLikerPack(process.getProcessCode(), "processCode", packBean); } if (StringUtils.isNotEmpty(process.getProcessName())) { DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean); @@ -621,7 +621,7 @@ public class MesHqlPack { public static DdlPackBean getMesStep(MesStep step, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode); if (StringUtils.isNotEmpty(step.getStepCode())) { - DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean); + DdlPreparedPack.getStringLikerPack(step.getStepCode(), "stepCode", packBean); } if (StringUtils.isNotEmpty(step.getStepName())) { DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean); @@ -645,7 +645,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean); } if (StringUtils.isNotEmpty(stepParam.getParamCode())) { - DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean); + DdlPreparedPack.getStringLikerPack(stepParam.getParamCode(), "paramCode", packBean); } if (StringUtils.isNotEmpty(stepParam.getParamName())) { DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean); @@ -687,13 +687,13 @@ public class MesHqlPack { public static DdlPackBean getMesBom(MesBom bom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode); if (StringUtils.isNotEmpty(bom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(bom.getItemPartNo())) { - DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringLikerPack(bom.getItemPartNo(), "itemPartNo", packBean); } if (StringUtils.isNotEmpty(bom.getBomVersion())) { - DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean); + DdlPreparedPack.getStringLikerPack(bom.getBomVersion(), "bomVersion", packBean); } return packBean; @@ -708,13 +708,13 @@ public class MesHqlPack { public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode); if (StringUtils.isNotEmpty(processBom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(processBom.getItemPartNo())) { - DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean); } if (StringUtils.isNotEmpty(processBom.getProcessCode())) { - DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean); + DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean); } return packBean; @@ -729,7 +729,7 @@ public class MesHqlPack { public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); if (StringUtils.isNotEmpty(customer.getCustomerCode())) { - DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean); + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); } if (StringUtils.isNotEmpty(customer.getCustomerName())) { DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); @@ -747,7 +747,7 @@ public class MesHqlPack { public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode); if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) { - DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); + DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); } if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) { DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean); @@ -768,10 +768,10 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean); } if (StringUtils.isNotEmpty(customerPart.getPartNo())) { - DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(customerPart.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) { - DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); + DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); } return packBean; @@ -786,10 +786,10 @@ public class MesHqlPack { public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) { - DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean); + DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean); } if (StringUtils.isNotEmpty(keyData.getKeyDataName())) { - DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean); + DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean); } return packBean; @@ -804,10 +804,10 @@ public class MesHqlPack { public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode); if (StringUtils.isNotEmpty(kpData.getPartNo())) { - DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "partNo", packBean); } if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) { - DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean); + DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean); } return packBean; @@ -822,10 +822,10 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode); if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) { - DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) { - DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); } return packBean; @@ -840,7 +840,7 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode); if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) { - DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); + DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) { DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean); @@ -864,7 +864,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean); } if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) { - DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(prodCfgDetail.getPartNo(), "partNo", packBean); } return packBean; @@ -879,7 +879,7 @@ public class MesHqlPack { public static DdlPackBean getMesPart(MesPart part, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode); if (StringUtils.isNotEmpty(part.getPartNo())) { - DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(part.getPartName())) { DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean); @@ -906,7 +906,7 @@ public class MesHqlPack { public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode); if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) { - DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean); + DdlPreparedPack.getStringLikerPack(partCategory.getCategoryCode(), "categoryCode", packBean); } if (StringUtils.isNotEmpty(partCategory.getCategoryName())) { DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean); @@ -924,7 +924,7 @@ public class MesHqlPack { public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode); if (StringUtils.isNotEmpty(packSpec.getSpecCode())) { - DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean); + DdlPreparedPack.getStringLikerPack(packSpec.getSpecCode(), "specCode", packBean); } if (StringUtils.isNotEmpty(packSpec.getSpecName())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); @@ -945,7 +945,7 @@ public class MesHqlPack { public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode); if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) { - DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); + DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); } if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) { DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean); @@ -963,7 +963,7 @@ public class MesHqlPack { public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode); if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) { - DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(kpsnRule.getPartNo(), "partNo", packBean); } return packBean; @@ -978,7 +978,7 @@ public class MesHqlPack { public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode); if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) { - DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(partScheduleBom.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) { DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean); @@ -996,10 +996,10 @@ public class MesHqlPack { public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); if (StringUtils.isNotEmpty(objectDao.getObjectCode())) { - DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean); } if (StringUtils.isNotEmpty(objectDao.getDaoClass())) { - DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean); + DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean); } return packBean; @@ -1014,10 +1014,10 @@ public class MesHqlPack { public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) { - DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); } if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) { - DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); } if (null != pcnSyncCfg.getSyncType()) { DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); @@ -1035,10 +1035,10 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) { - DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean); + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getParamCode(), "paramCode", packBean); } return packBean; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 7d034c6..e1ede6a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -18,7 +18,6 @@ public class WmsTaskInfoModel implements Serializable { private static final long serialVersionUID = 8755413052807531167L; @ApiParam("任务单号") public String orderNo; - @Column(name = "TRANS_TYPE_CODE") /** * 状态:1=创建,10=待处理,20=已处理 */ @@ -28,6 +27,7 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("作业类型名称") public String opTypeName; + @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index e33b3b1..a01642f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TASK") +@Table(name = "WMS_TASK",indexes = { + @Index(columnList = "TASK_STATUS"), + @Index(columnList = "TRANS_TYPE_CODE") +}) @Api("作业任务表") public class WmsTaskInfo extends BaseBean {