Merge branch 'dev' into test

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

@@ -41,6 +41,10 @@ public class MesPartObject extends BaseBean {
     @ApiParam("物料名称")
     private String objectName;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
     @Transient
     @ApiParam("产品条码")
     private String productSn;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IMesPartObjectRepository.java

@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartObject;
-
-/**
- * @Description:
- * @Reference:
- * @Author: joke.wang
- * @CreateDate: 2019\11\25 15:07
- * @Modify:
- **/
-public interface IMesPartObjectRepository extends BaseRepository<MesPartObject, Long> {
-}

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

@@ -1854,8 +1854,8 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) {
             DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean);
         }
-        if (!StringUtils.isEmpty(mesProduceSn.getWorkCellCode())) {
+        if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (mesProduceSn.getSnStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
@@ -1863,6 +1863,10 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
+        DdlPreparedPack.timeBuilder(
+                mesProduceSn.getCreateDateTimeStart(),
+                mesProduceSn.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
         return packBean;
     }
 
@@ -1889,6 +1893,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesProdBindRecord.getWorkCellCode())) {
             DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesProdBindRecord.getLotNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getLotNo(), "lotNo", packBean);
+        }
         if (mesProdBindRecord.getIsBindKey() != null) {
             DdlPreparedPack.getNumEqualPack(mesProdBindRecord.getIsBindKey(), "isBindKey", packBean);
         }
@@ -1992,4 +1999,39 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 条码履历报表
+     * @param mesProduceSnTravel
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesProduceSnTravel(MesProduceSnTravel mesProduceSnTravel, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSnTravel, organizeCode);
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getProductSn(), "productSn", packBean);
+        }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (mesProduceSnTravel.getSnStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getSnStatus(), "snStatus", packBean);
+        }
+        if (mesProduceSnTravel.getQcStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean);
+        }
+        DdlPreparedPack.timeBuilder(
+                mesProduceSnTravel.getCreateDateTimeStart(),
+                mesProduceSnTravel.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+        return packBean;
+    }
 }