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

【bug：7408报表优化1】

Browse Source
yun-zuoyi
jokelone 5 years ago
parent 68e7dc8906
commit 3f0646403f
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
Unescape Escape View File

@ -30,7 +30,8 @@ import javax.persistence.Table;
@Table(name = "MES_PROD_BIND_RECORD", indexes = { @Table(name = "MES_PROD_BIND_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "KP_SN"), @Index(columnList = "KP_SN"),
@Index(columnList = "CREATE_DATE_TIME") @Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "ITEM_PART_NO")
}) })
@Api("产品绑定记录表") @Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean { public class MesProdBindRecord extends BaseBean {

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
Unescape Escape View File

@ -26,7 +26,8 @@ import java.math.BigDecimal;
@Table(name = "MES_PRODUCE_SN", indexes = { @Table(name = "MES_PRODUCE_SN", indexes = {
@Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"), @Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME") @Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
}) })
@Api("产品条码表") @Api("产品条码表")
public class MesProduceSn extends BaseBean { public class MesProduceSn extends BaseBean {

1
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
Unescape Escape View File

@ -26,6 +26,7 @@ import javax.persistence.*;
@Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PRODUCT_SN"), @Index(columnList = "PRODUCT_SN"),
@Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO"),
@Index(columnList = "MODIFY_DATE_TIME") @Index(columnList = "MODIFY_DATE_TIME")
}) })
@Api("产品条码履历表") @Api("产品条码履历表")

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java
Unescape Escape View File

@ -25,7 +25,8 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_CHECK_DATA", indexes = { @Table(name = "MES_QC_CHECK_DATA", indexes = {
@Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "SN") @Index(columnList = "SN"),
@Index(columnList = "partNo")
}) })
@Api("质量过程检测数据") @Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean { public class MesQcCheckData extends BaseBean {

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java
Unescape Escape View File

@ -27,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name = "MES_REPAIR_RECORD", indexes = { @Table(name = "MES_REPAIR_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "CREATE_DATE_TIME") @Index(columnList = "CREATE_DATE_TIME"),
@Index(columnList = "PART_NO")
}) })
@Api("维修信息记录表") @Api("维修信息记录表")
public class MesRepairRecord extends BaseBean { public class MesRepairRecord extends BaseBean {

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

@ -1822,13 +1822,13 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
} }
if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
} }
if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
} }
if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean);
} }
if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
@ -1871,7 +1871,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean); DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
} }
if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) { if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean); DdlPreparedPack.getStringEqualPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
} }
if (!StringUtils.isEmpty(mesProdBindRecord.getKpSn())) { if (!StringUtils.isEmpty(mesProdBindRecord.getKpSn())) {
DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getKpSn(), "kpSn", packBean); DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getKpSn(), "kpSn", packBean);
@ -1935,10 +1935,10 @@ public class MesHqlPack {
public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) { public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode); DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode);
if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) { if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
} }
if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) { if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean); DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
} }
if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) { if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean);
@ -1974,13 +1974,13 @@ public class MesHqlPack {
public static DdlPackBean getMesQcCheckData(MesQcCheckData mesQcCheckData, String organizeCode) { public static DdlPackBean getMesQcCheckData(MesQcCheckData mesQcCheckData, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckData, organizeCode); DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckData, organizeCode);
if (!StringUtils.isEmpty(mesQcCheckData.getPartNo())) { if (!StringUtils.isEmpty(mesQcCheckData.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringRightLikerPack(mesQcCheckData.getPartNo(), "partNo", packBean);
} }
if (!StringUtils.isEmpty(mesQcCheckData.getOrderNo())) { if (!StringUtils.isEmpty(mesQcCheckData.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(mesQcCheckData.getOrderNo(), "orderNo", packBean);
} }
if (!StringUtils.isEmpty(mesQcCheckData.getSn())) { if (!StringUtils.isEmpty(mesQcCheckData.getSn())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean); DdlPreparedPack.getStringEqualPack(mesQcCheckData.getSn(), "sn", packBean);
} }
if (mesQcCheckData.getCheckType() != null) { if (mesQcCheckData.getCheckType() != null) {
DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean); DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean);
@ -2013,13 +2013,13 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean);
} }
if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) { if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringRightLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean);
} }
if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) { if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean); DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean);
} }
if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) { if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getProductSn(), "productSn", packBean); DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getProductSn(), "productSn", packBean);
} }
if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) { if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean);

Write Preview
Loading…
Cancel
Save