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

# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 @Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
-    }
+}
 )
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean implements Serializable {
@@ -35,6 +35,10 @@ public class MesPackageDetail extends BaseBean implements Serializable {
     @ApiParam("包装编码")
     private String packageNo;
 
+    @Column(name = "CT_LOCATION_NO")
+    @ApiParam("容器位置编号")
+    private String ctLocationNo;
+
     @Column(name = "SERIAL_NUMBER", nullable = false)
     @ApiParam("过程条码")
     private String serialNumber;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java

@@ -2,8 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail;
 
 /**
  * @Author: Wynne.Lu

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

@@ -0,0 +1,81 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: dominic
+ * @CreateDate: 2020/10/29 14:11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PACKAGE")
+@Api("料箱表")
+public class IfPackage extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 9099416791684702129L;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "PORCESS_NAME")
+    @ApiParam("工序名称")
+    private String porcessName;
+
+    @Column(name = "RK_TYPE")
+    @ApiParam("料架类型")
+    private String rkType;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "ACTION_DATE_TIME")
+    @ApiParam("操作时间")
+    private String actionDateTime;
+
+    @Column(name = "ACTION_USER")
+    @ApiParam("操作人")
+    private String actionUser;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+}

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

@@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable {
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @Column(name = "DEFECT_ACTION_TYPE")
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
     @Column(name = "DEFECT_FLAG_VALUE")
     @ApiParam("缺陷标识值")
     private String defectFlagValue;
@@ -67,6 +71,7 @@ public class MesDefect extends BaseBean implements Serializable {
     @Transient
     @ApiParam("缺陷类型子集")
     private List<MesDefect> mesDefectList;
+
     public MesDefect() {
 
     }

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

@@ -730,6 +730,7 @@ public class MesHqlPack {
 
     /**
      * 产线看板矩阵
+     *
      * @param boardLineMatrix
      * @param organizeCode
      * @return
@@ -3561,6 +3562,7 @@ public class MesHqlPack {
         return packBean;
     }
 
+
     /**
      * MES容器位置查询条件封装
      *

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

@@ -696,10 +696,23 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.custNo = custNo;
     }
 
-    public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) {
+    public WmsDocMovementDetails(String orderNo, String prodCfgTypeCode, String prodCfgTypeName,
+                                 Double qty, String planDate, String planTime, String custNo) {
+        this.orderNo = orderNo;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.qty = qty;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.custNo = custNo;
+    }
+
+
+    public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode, String custNo) {
         this.orderNo = orderNo;
         this.pickQty = pickQty;
         this.prodCfgTypeCode = prodCfgTypeCode;
+        this.custNo = custNo;
     }
 
 }