jx mes 修理品票 报表 增加产品条码字段查询跟展示

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SxRepairRecordDao.java

@@ -43,7 +43,7 @@ public class SxRepairRecordDao implements ISxRepairRecordDao {
     public List<SxRepairRecordReportModel> queryRepairRecordByPager(SxRepairRecordReportModel model, Pager pager) {
         StringBuffer hql = new StringBuffer();
         hql.append(" select new " + SxRepairRecordReportModel.class.getName() + "(bcd.id, bcd.workTime, bcd.shiftCode, bcd.workOrderNo, bcd.workCenterCode, " +
-                " bcd.workCellCode, bcd.serialNumber, bcd.partNo, bcd.partNameRdd, bcd.defectCode, bcd.defectName, bcd.defectType, bcd.defectTypeName, bcd.defectActionTime, " +
+                " bcd.workCellCode, bcd.serialNumber, bcd.productSn, bcd.partNo, bcd.partNameRdd, bcd.defectCode, bcd.defectName, bcd.defectType, bcd.defectTypeName, bcd.defectActionTime, " +
                 " bcd.repairStatus, bcd.createUser, rre.dcCode, rre.dcName, rre.repairCode, rre.repairName,bcd.approvalStatus, rre.memo, rre.repairJudge, rre.repairDatetime, rre.modifyUser) ");
 
         packHqlForQueryRepairRecord(hql, model);
@@ -82,6 +82,9 @@ public class SxRepairRecordDao implements ISxRepairRecordDao {
         if (!StringUtils.isEmpty(model.getSerialNumber())) {
             hql.append(" and bcd.serialNumber = :serialNumber ");
         }
+        if (!StringUtils.isEmpty(model.getProductSn())) {
+            hql.append(" and bcd.productSn = :productSn ");
+        }
         if (!StringUtils.isEmpty(model.getDefectCode())) {
             hql.append(" and bcd.defectCode = :defectCode ");
         }
@@ -121,6 +124,9 @@ public class SxRepairRecordDao implements ISxRepairRecordDao {
         if (!StringUtils.isEmpty(model.getSerialNumber())) {
             query.setParameter(MesExtConstWords.SERIAL_NUMBER, model.getSerialNumber());
         }
+        if (!StringUtils.isEmpty(model.getProductSn())) {
+            query.setParameter(MesExtConstWords.PRODUCT_SN, model.getProductSn());
+        }
         if (!StringUtils.isEmpty(model.getDefectCode())) {
             query.setParameter(MesExtConstWords.DEFECT_CODE, model.getDefectCode());
         }

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

@@ -53,6 +53,9 @@ public class SxRepairRecordReportModel implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @ApiParam("产品条码")
+    private String productSn;
+
     @ApiParam("不良标识代码")
     private String defectCode;
 
@@ -113,7 +116,7 @@ public class SxRepairRecordReportModel implements Serializable {
     public SxRepairRecordReportModel() {}
 
     public SxRepairRecordReportModel(Long id, String workTime, String shiftCode, String workOrderNo, String workCenterCode, String workCellCode,
-                                     String serialNumber, String partNo, String partNameRdd, String defectCode, String defectName, String defectType,
+                                     String serialNumber, String productSn, String partNo, String partNameRdd, String defectCode, String defectName, String defectType,
                                      String defectTypeName, String defectActionTime, Integer repairStatus, String createUser, String dcCode, String dcName,
                                      String repairCode, String repairName, Integer approvalStatus,String memo, Integer repairJudge, String repairDatetime, String modifyUser) {
         this.id = id;
@@ -123,6 +126,7 @@ public class SxRepairRecordReportModel implements Serializable {
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;
         this.serialNumber = serialNumber;
+        this.productSn = productSn;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.defectCode = defectCode;