修理票报表

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

@@ -44,7 +44,8 @@ public class SxRepairRecordDao implements ISxRepairRecordDao {
         StringBuffer hql = new StringBuffer();
         hql.append(" select new " + SxRepairRecordReportModel.class.getName() + "(bcd.id, bcd.workTime, bcd.shiftCode, bcd.workOrderNo, bcd.workCenterCode, " +
                 " 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) ");
+                " bcd.repairStatus, bcd.createUser, rre.dcCode, rre.dcName, rre.repairCode, rre.repairName,bcd.approvalStatus, rre.memo, rre.repairJudgeCode,rre.repairJudgeName, rre.repairDatetime, rre.modifyUser, " +
+                " rre.qty, rre.badPartNo, rre.badPartName) ");
 
         packHqlForQueryRepairRecord(hql, model);
 

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

@@ -116,13 +116,22 @@ public class SxRepairRecordReportModel implements Serializable {
     @ApiParam("维修人")
     private String modifyUser;
 
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("不良部品编码")
+    private String badPartNo;
+
+    @ApiParam("不良部品名称")
+    private String badPartName;
+
     public SxRepairRecordReportModel() {}
 
     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,
-                                     String repairDatetime, String modifyUser) {
+                                     String repairDatetime, String modifyUser, Double qty, String badPartNo, String badPartName) {
         this.id = id;
         this.workTime = workTime;
         this.shiftCode = shiftCode;
@@ -151,5 +160,8 @@ public class SxRepairRecordReportModel implements Serializable {
         this.repairJudgeName = repairJudgeName;
         this.repairDatetime = repairDatetime;
         this.modifyUser = modifyUser;
+        this.qty = qty;
+        this.badPartNo = badPartNo;
+        this.badPartName = badPartName;
     }
 }