13696 新增不良维修记录报表

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -435,6 +435,35 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
         this.andonCount = andonCount;
     }
 
+    /**
+     * 工位统计报表查询 构造函数
+     * @param workCenterCode
+     * @param workCenterNameRdd
+     * @param workCellCode
+     * @param workCellNameRdd
+     * @param equipmentCode
+     * @param equipmentNameRdd
+     * @param shiftCode
+     * @param shiftNameRdd
+     * @param alarmCode
+     * @param andonCount
+     */
+    public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellNameRdd,String workCellCode,
+                            String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd,
+                            String alarmCode, Long andonCount) {
+        this.workCenterCode = workCenterCode;
+        this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellNameRdd = workCellNameRdd;
+        this.workCellCode = workCellCode;
+        this.equipmentCode = equipmentCode;
+        this.equipmentNameRdd = equipmentNameRdd;
+        this.shiftCode = shiftCode;
+        this.shiftNameRdd = shiftNameRdd;
+        this.alarmCode = alarmCode;
+        this.andonCount = andonCount;
+    }
+
+
     public static void main(String[] args) {
         try {
             List ds = new ArrayList();

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

@@ -119,6 +119,22 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("产品二维码")
     private String productSn;
 
+    @Transient
+    @ApiParam("措施代码")
+    private String repairCode;
+
+    @Transient
+    @ApiParam("措施描述")
+    private String repairName;
+
+    @Transient
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Transient
+    @ApiParam("缺陷原因描述")
+    private String dcName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
@@ -149,4 +165,33 @@ public class MesDefectRecord extends BaseBean implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public MesDefectRecord(Long id, String serialNumber, String workOrderNo, String partNo, String partName, String defectCode,
+                           String defectName, String defectLocation, String sideLocation, Integer repairStatus, String workCenterCode,
+                           String workCellCode, String memo, String defectActionType, Double qty, String repairCode, String repairName,
+                           String dcCode, String dcName, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.serialNumber = serialNumber;
+        this.workOrderNo = workOrderNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectLocation = defectLocation;
+        this.sideLocation = sideLocation;
+        this.repairStatus = repairStatus;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.memo = memo;
+        this.defectActionType = defectActionType;
+        this.qty = qty;
+        this.repairCode = repairCode;
+        this.repairName = repairName;
+        this.dcCode = dcCode;
+        this.dcName = dcName;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
 }

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

@@ -97,7 +97,7 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String spareMemo;
 
-    @Transient
+    @Column(name = "DEFECT_RECORD_ID")
     @ApiParam("不良记录id")
     private Long defectRecordId;
 

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

@@ -2220,9 +2220,6 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
             DdlPreparedPack.getStringEqualPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
         }
-        if (!StringUtils.isEmpty(defectRecord.getProductSn())) {
-            DdlPreparedPack.getStringEqualPack(defectRecord.getProductSn(), "productSn", packBean);
-        }
         if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
             DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean);
         }