JxPrintPackageAndSpotTicketService打印模板增加打印参数

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.productSn, bcd.partNo, bcd.partNameRdd, bcd.defectCode, bcd.defectName, bcd.defectType, bcd.defectTypeName, bcd.defectActionTime, " +
+                " bcd.workCellCode, bcd.manageCode, 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.repairJudgeCode,rre.repairJudgeName, rre.repairDatetime, rre.modifyUser) ");
 
         packHqlForQueryRepairRecord(hql, model);
@@ -145,5 +145,8 @@ public class SxRepairRecordDao implements ISxRepairRecordDao {
         if (!StringUtils.isEmpty(model.getRepairJudgeCode())) {
             query.setParameter(MesExtConstWords.REPAIR_JUDGE, model.getRepairJudgeCode());
         }
+        if (!StringUtils.isEmpty(model.getManageCode())) {
+            query.setParameter(MesExtConstWords.MANAGE_CODE, model.getManageCode());
+        }
     }
 }

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

@@ -50,6 +50,9 @@ public class SxRepairRecordReportModel implements Serializable {
     @ApiParam("物料名称")
     private String partNameRdd;
 
+    @ApiParam("管理码")
+    private String manageCode;
+
     @ApiParam("产品条码")
     private String serialNumber;
 
@@ -115,7 +118,7 @@ public class SxRepairRecordReportModel implements Serializable {
 
     public SxRepairRecordReportModel() {}
 
-    public SxRepairRecordReportModel(Long id, String workTime, String shiftCode, String workOrderNo, String workCenterCode, String workCellCode,
+    public SxRepairRecordReportModel(Long id, String workTime, String shiftCode, String workOrderNo, String workCenterCode, String workCellCode, String manageCode,
                                      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, String repairJudgeCode, String repairJudgeName,
@@ -126,6 +129,7 @@ public class SxRepairRecordReportModel implements Serializable {
         this.workOrderNo = workOrderNo;
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;
+        this.manageCode = manageCode;
         this.serialNumber = serialNumber;
         this.productSn = productSn;
         this.partNo = partNo;