Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -6725,4 +6725,37 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PENDING_REPORT_TYPE {
+
+        IDENTIFICATION_TYPE(10, "鉴定类型"),
+        FAILURE_MODE(20, "失效模式");
+
+        private int value;
+        private String description;
+
+        PENDING_REPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
 }

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

@@ -80,4 +80,8 @@ public class IfPackage extends BaseBean implements Serializable {
     @Column(name = "SYNC_STATUS")
     @ApiParam("同步状态")
     private Integer syncStatus;
+
+    @Column(name = "QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
 }

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

@@ -128,4 +128,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "SYNC_FLAG")
     @ApiParam("同步标识(同步工具使用)")
     private Integer syncFlag;
+
+    @Column(name = "QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
 }

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

@@ -108,6 +108,9 @@ public class MesBom extends BaseBean implements Serializable {
     @ApiParam("报废数")
     private Double wasteQty = 0d;
 
+    @Transient
+    @ApiParam("客户零件号")
+    private String custPartNo;
 
 
     public double getQtyVal() {

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

@@ -117,6 +117,22 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("入库时间")
     private String inLocationTime;
 
+    @Column(name = "PATTERN_CODE")
+    @ApiParam("模式代码")
+    private String patternCode;
+
+    @Column(name = "PATTERN_NAME")
+    @ApiParam("模式代码名称")
+    private String patternName;
+
+    @Column(name = "QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @Column(name = "IS_RETURN")
+    @ApiParam("是否回传")
+    private Integer isReturn;
+
     @Transient
     @ApiParam("封箱状态")
     private String sealStatus;
@@ -211,6 +227,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String productSn;
 
+    @Transient
+    @ApiParam("临时条码集合")
+    private List<MesTemporarySnRecord> mesTemporarySnRecordList = new ArrayList<>();
+
     public MesPackage() {
     }
 

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

@@ -69,11 +69,15 @@ public class MesPackageDetail extends BaseBean implements Serializable {
     @ApiParam("包装编码4")
     private String packageNo4;
 
+    @Column(name = "QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
     @Transient
     @ApiParam("批次")
     private String lotNo;
 
-    @Transient
+    @Column(name = "PRODUCT_SN")
     @ApiParam("产品条码")
     private String productSn;
 

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

@@ -85,4 +85,8 @@ public class MesQuarantineRecord extends BaseBean {
     @Column(name = "REPAIR_NAME")
     @ApiParam("维修名称")
     private String repairName;
+
+    @Column(name = "IS_CANCEL_REPAIR")
+    @ApiParam("取消报废")
+    private Integer isCancelScrap;
 }

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

@@ -0,0 +1,72 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TEMPORARY_SN_RECORD")
+@Api("MES_临时条码记录信息")
+public class MesTemporarySnRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5274274774653791153L;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "IF_PACK")
+    @ApiParam("是否打包")
+    private Integer ifPack;
+
+    @Column(name = "PATTERN_CODE")
+    @ApiParam("模式代码")
+    private String patternCode;
+
+    @Column(name = "PATTERN_NAME")
+    @ApiParam("模式名称")
+    private String patternName;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesTemporarySnRecord;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\13 11:53
+ * @Modify:
+ **/
+public interface MesTemporarySnRecordRepository extends BaseRepository<MesTemporarySnRecord, Long> {
+}

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

@@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**

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

@@ -1379,6 +1379,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getCtNo(), "ctNo", result);
         if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
             DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result);
         }