Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test

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

@@ -169,12 +169,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
     }
 
-    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) {
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime) {
         this.workCenterCode = workCenterCode;
         this.partNo = partNo;
         this.partName = partName;
         this.packageNo = packageNo;
-        this.itemQty = itemQty;
+        this.qty = qty;
         this.createDatetime = createDatetime;
     }
 }

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

@@ -109,6 +109,9 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("缺陷数量")
     private Integer defectQty;
 
+    @ApiParam("维修状态名称")
+    private String repairStatusName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

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

@@ -22,7 +22,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "PACKAGE_NO2")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
 })

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

@@ -2194,39 +2194,40 @@ public class MesHqlPack {
     }
 
     /**
-     * 维修记录
+     * 不良记录
      *
-     * @param mesRepairRecord
+     * @param defectRecord
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode);
-        if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) {
-            DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
+    public static DdlPackBean getMesDefectRecord(MesDefectRecord defectRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(defectRecord, organizeCode);
+        if (!StringUtils.isEmpty(defectRecord.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) {
-            DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(defectRecord.getSerialNumber(), "serialNumber", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getWorkCellCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCellCode(), "workCellCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getDefectCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDefectCode(), "defectCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getDefectCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getRepairCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getRepairCode(), "repairCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
+            DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) {
+
+        if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
-                    mesRepairRecord.getCreateDateTimeStart(),
-                    mesRepairRecord.getCreateDateTimeEnd(),
+                    defectRecord.getCreateDateTimeStart(),
+                    defectRecord.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
         return packBean;