过程追溯报表、条码履历报表生产条码字段更改为productSn

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/SxReportFormService.java

@@ -88,7 +88,7 @@ public class SxReportFormService implements ISxReportFormService {
 
     @Override
     public ListPager<MesProduceSnTravelExt> queryProduceSnTravelExtByPager(MesProduceSnTravelExt produceSnTravelExt, Pager pager) {
-        DdlPackBean hqlPack = MesHqlPack.getMesProduceSnTravel(produceSnTravelExt, produceSnTravelExt.getOrganizeCode());
+        DdlPackBean hqlPack = MesExtHqlPack.getMesProduceSnTravel(produceSnTravelExt, produceSnTravelExt.getOrganizeCode());
         pager = PagerHelper.getPager(pager, produceSnTravelExtRepository.findByHqlWhereCount(hqlPack));
         hqlPack.setOrderByStr(produceSnTravelExt.orderBy());
         List<MesProduceSnTravelExt> produceSnTravelExtList = produceSnTravelExtRepository.findByHqlWherePage(hqlPack, pager);

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/ProduceSnExtModel.java

@@ -20,9 +20,12 @@ public class ProduceSnExtModel implements Serializable {
     @ApiParam("id")
     private Long id;
 
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @ApiParam("产品条码")
+    private String productSn;
+
     @ApiParam("物料号")
     private String partNo;
 

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

@@ -377,6 +377,7 @@ public class MesExtHqlPack {
         DdlPreparedPack.getStringEqualPack(model.getPartNo(), MesExtConstWords.PART_NO, packBean);
         DdlPreparedPack.getStringEqualPack(model.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);
         DdlPreparedPack.getStringLikerPack(model.getSerialNumber(), MesExtConstWords.SERIAL_NUMBER, packBean);
+        DdlPreparedPack.getStringLikerPack(model.getProductSn(), MesExtConstWords.PRODUCT_SN, packBean);
         DdlPreparedPack.getNumEqualPack(model.getSnStatus(), MesExtConstWords.SN_STATUS, packBean);
         DdlPreparedPack.getNumEqualPack(model.getQcStatus(), MesExtConstWords.QC_STATUS, packBean);
         DdlPreparedPack.getNumEqualPack(model.getSnType(), MesExtConstWords.SN_TYPE, packBean);
@@ -961,5 +962,24 @@ public class MesExtHqlPack {
         return packBean;
     }
 
+        public static DdlPackBean getMesProduceSnTravel(MesProduceSnTravel mesProduceSnTravel, String organizeCode) {
+            DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSnTravel, organizeCode);
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), MesExtConstWords.WORK_ORDER_NO, packBean);
+            DdlPreparedPack.getStringRightLikerPack(mesProduceSnTravel.getPartNo(), MesExtConstWords.PART_NO, packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getSerialNumber(), MesExtConstWords.SERIAL_NUMBER, packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSnTravel.getProductSn(), MesExtConstWords.PRODUCT_SN, packBean);
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), MesExtConstWords.WORK_CELL_CODE, packBean);
+            DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getSnStatus(), MesExtConstWords.SN_STATUS, packBean);
+            DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), MesExtConstWords.QC_STATUS, packBean);
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getVinCode(), "vinCode", packBean);
+            DdlPreparedPack.getStringBiggerPack(mesProduceSnTravel.getOutWorkCenterTimeStart(), MesExtConstWords.OUT_WORK_CENTER_TIME, packBean);
+            DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), MesExtConstWords.OUT_WORK_CENTER_TIME, packBean);
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);
+            if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) {
+                DdlPreparedPack.timeBuilder(mesProduceSnTravel.getCreateDateTimeStart(), mesProduceSnTravel.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
+            }
+            return packBean;
+        }
+
 
 }