【bug：7408报表优化】

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java

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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java

@@ -93,4 +93,24 @@ public class MesQcCheckData extends BaseBean {
     @Column(name = "CUST_CODE")
     @ApiParam("客户代码")
     private String custCode;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Transient
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @Transient
+    @ApiParam("班组")
+    private String shiftGroupName;
+
+    @Transient
+    @ApiParam("班长")
+    private String squadLeader;
+
+    @Transient
+    @ApiParam("工作单元名称")
+    private String workCellName;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1849,10 +1849,12 @@ public class MesHqlPack {
 //                    mesProduceSn.getOutWorkCenterEndTime(),
 //                    "outWorkCenterTime", packBean, true);
         }
-        DdlPreparedPack.timeBuilder(
+        if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
-                mesProduceSn.getCreateDateTimeStart(),
+            DdlPreparedPack.timeBuilder(
-                mesProduceSn.getCreateDateTimeEnd(),
+                    mesProduceSn.getCreateDateTimeStart(),
-                "createDatetime", packBean, true);
+                    mesProduceSn.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         return packBean;
     }
 
@@ -1865,8 +1867,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesProdBindRecord(MesProdBindRecord mesProdBindRecord, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdBindRecord, organizeCode);
-        if (!StringUtils.isEmpty(mesProdBindRecord.getPartNo())) {
+        if (!StringUtils.isEmpty(mesProdBindRecord.getItemPartNo())) {
-            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringRightLikerPack(mesProdBindRecord.getItemPartNo(), "itemPartNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProdBindRecord.getSerialNumber())) {
             DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSerialNumber(), "serialNumber", packBean);
@@ -1892,15 +1894,17 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) {
             DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean);
         }
-        DdlPreparedPack.timeBuilder(
+        if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) {
-                mesProdBindRecord.getCreateDateTimeStart(),
+            DdlPreparedPack.timeBuilder(
-                mesProdBindRecord.getCreateDateTimeEnd(),
+                    mesProdBindRecord.getCreateDateTimeStart(),
-                "createDatetime", packBean, true);
+                    mesProdBindRecord.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         return packBean;
     }
 
     /**
-     * 物料追溯
+     * 包装明细
      *
      * @param ifPackageDetail
      * @param organizeCode
@@ -1951,10 +1955,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) {
             DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean);
         }
-        DdlPreparedPack.timeBuilder(
+        if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) {
-                mesRepairRecord.getCreateDateTimeStart(),
+            DdlPreparedPack.timeBuilder(
-                mesRepairRecord.getCreateDateTimeEnd(),
+                    mesRepairRecord.getCreateDateTimeStart(),
-                "createDatetime", packBean, true);
+                    mesRepairRecord.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         return packBean;
     }
 
@@ -1976,7 +1982,7 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesQcCheckData.getSn())) {
             DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean);
         }
-        if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) {
+        if (mesQcCheckData.getCheckType() != null) {
             DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean);
         }
         if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) {
@@ -1985,10 +1991,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesQcCheckData.getWorkCellCode())) {
             DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCellCode(), "workCellCode", packBean);
         }
-        DdlPreparedPack.timeBuilder(
+        if (!StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesQcCheckData.getCreateDateTimeEnd())) {
-                mesQcCheckData.getCreateDateTimeStart(),
+            DdlPreparedPack.timeBuilder(
-                mesQcCheckData.getCreateDateTimeEnd(),
+                    mesQcCheckData.getCreateDateTimeStart(),
-                "createDatetime", packBean, true);
+                    mesQcCheckData.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         return packBean;
     }
 
@@ -2028,10 +2036,12 @@ public class MesHqlPack {
         if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
-        DdlPreparedPack.timeBuilder(
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) {
-                mesProduceSnTravel.getCreateDateTimeStart(),
+            DdlPreparedPack.timeBuilder(
-                mesProduceSnTravel.getCreateDateTimeEnd(),
+                    mesProduceSnTravel.getCreateDateTimeStart(),
-                "createDatetime", packBean, true);
+                    mesProduceSnTravel.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         return packBean;
     }