Merge remote-tracking branch 'remotes/origin/test' into dev

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/bean/MesPart.java

@@ -162,4 +162,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("BOM用量")
     private Double bomQty = 0d;
+
+    @Transient
+    @ApiParam("客户零件号")
+    private String custPartNo;
 }

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

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -28,7 +25,12 @@ import java.util.Date;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_ACTUAL")
+@Table(name = "MES_QUEUE_JIT_ACTUAL", indexes = {
+        @Index(columnList = "JIS_ACTUAL_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "VIN_CODE"),
+        @Index(columnList = "JIT_SEQ")
+})
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -28,7 +29,12 @@ import java.io.Serializable;
 @AllArgsConstructor
 @Builder
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
+@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM", indexes = {
+        @Index(columnList = "JIS_ACTUAL_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PRODUCE_CTGY_CODE"),
+        @Index(columnList = "PART_NO")
+})
 @Api("客户JIT生产队列散件清单")
 public class MesQueueJitActualBom extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1604529847020812472L;

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

@@ -7,10 +7,7 @@ import lombok.*;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -27,7 +24,12 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor
 @Builder
-@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL")
+@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL", indexes = {
+        @Index(columnList = "JIS_ACTUAL_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "PRODUCE_CTGY_CODE")
+})
 @Api("MES_客户JIT生产队列明细")
 public class MesQueueJitActualDetail extends BaseBean implements Serializable {
 

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

@@ -9,11 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -28,7 +24,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_PLAN")
+@Table(name = "MES_QUEUE_JIT_PLAN", indexes = {
+        @Index(columnList = "JIS_PLAN_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "VIN_CODE")
+})
 @Api("MES_客户JIT预装队列")
 public class MesQueueJitPlan extends BaseBean implements Serializable {
 

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -26,7 +27,12 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_PLAN_BOM")
+@Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = {
+        @Index(columnList = "JIS_PLAN_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PRODUCE_CTGY_CODE"),
+        @Index(columnList = "PART_NO")
+})
 @Api("MES_客户JIT预装队列BOM")
 public class MesQueueJitPlanBom extends BaseBean implements Serializable {
 

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -26,7 +23,12 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL")
+@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL", indexes = {
+        @Index(columnList = "JIS_PLAN_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PRODUCE_CTGY_CODE"),
+        @Index(columnList = "PART_NO")
+})
 @Api("MES_客户JIT预装队列明细")
 public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
 

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

@@ -27,7 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_QUEUE_ORDER_BOM", indexes = {
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "ORDER_NO"),
-        @Index(columnList = "PART_NO")
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "PRODUCE_CTGY_CODE")
 })
 @Api("MES_生产队列散件清单")
 public class MesQueueOrderBom extends BaseBean  implements Serializable {

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

@@ -159,6 +159,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("校验内容")
     private String checkContent;
 
+    @Transient
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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) {
+    public static DdlPackBean getMesDefectRecord(MesDefectRecord defectRecord, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode);
+        DdlPackBean packBean = getAllBaseDataByNormalPro(defectRecord, organizeCode);
-        if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) {
+        if (!StringUtils.isEmpty(defectRecord.getPartNo())) {
-            DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) {
+        if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) {
-            DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
+            DdlPreparedPack.getStringLikerPack(defectRecord.getSerialNumber(), "serialNumber", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) {
+        if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean);
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getWorkCellCode())) {
+        if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getDefectCode())) {
+        if (!StringUtils.isEmpty(defectRecord.getDefectCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDefectCode(), "defectCode", packBean);
+            DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getRepairCode())) {
+        if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getRepairCode(), "repairCode", packBean);
+            DdlPreparedPack.getStringLikerPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) {
+        if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean);
+            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(),
+                    defectRecord.getCreateDateTimeStart(),
-                    mesRepairRecord.getCreateDateTimeEnd(),
+                    defectRecord.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
         return packBean;
@@ -2782,8 +2783,8 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) {
+    public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode);
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());;
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3636,4 +3637,28 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    /**
+     * MES_看板自定义参数配置查询条件封装
+     *
+     * @param boardLineStaffMatrix
+     * @return
+     */
+    public static DdlPackBean getBoardLineStaffMatrix(MesBoardLineStaffMatrix boardLineStaffMatrix) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardLineStaffMatrix.getOrganizeCode());
+        if (!StringUtils.isEmpty(boardLineStaffMatrix.getBoardCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getBoardCode(), "boardCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCellCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineStaffMatrix.getUserCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getUserCode(), "userCode", packBean);
+        }
+        return packBean;
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java

@@ -86,8 +86,6 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam(value = "工单码")
     private String workOrderCode;
 
-    @Column(name = "SEQ_NO")
-    @ApiParam(value = "父位置号")
     private String seqNo;
 
     @Column(name = "SN_TYPE")
@@ -95,13 +93,15 @@ public class WmsDocMovementSn extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
     private Integer snType;
 
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam(value = "目标库位代码")
+    public String destLocateNo;
+
+
     @Transient
     @ApiParam("前端表格编辑使用")
     private Boolean isSet = false;
 
-    @Transient
-    @ApiParam("目标库位代码")
-    public String destLocateNo;
 
     @Transient
     @ApiParam("源库位代码")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1753,7 +1753,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
+        //DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
         /*DdlPreparedPack.getOrderByPack(