Merge branch 'test' into ext-dev

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

@@ -2099,7 +2099,8 @@ public class MesEnumUtil {
         MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"),
         MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
         MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
-        MES_JISA(640, "jisaExcelService", "JISA导入");
+        MES_JISA(640, "jisaExcelService", "JISA导入"),
+        MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入");
 
         private int value;
         private String service;
@@ -3737,8 +3738,7 @@ public class MesEnumUtil {
         INSTOCKED(40, "入库"),
         SHIPING(50, "发运"),
         REDO(60, "重做"),
-        CLOSE(90, "关闭"),
+        CLOSE(90, "关闭");
-        ;
 
         private int value;
         private String description;

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

@@ -456,7 +456,8 @@ public class MesPcnEnumUtil {
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
         EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
-        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值"),
+        SCAN_CT_NO_TYPE("SCAN_CT_NO_TYPE", "料架号扫描校验类型值");
         private String value;
         private String description;
 

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

@@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author: Wynne.Lu
@@ -190,6 +192,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("汇总数量")
     private Integer gatherQty = 0;
 
+    @Transient
+    @ApiParam("包装编号集合")
+    private List<String> packageNoList = new ArrayList<>();
+
     public MesPackage() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java

@@ -6,9 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
  * @Description: 控制计划导入模板
  * @CreateDate: 2020/9/29
@@ -40,25 +37,25 @@ public class MesControlPlanTemplateModel extends BaseBean {
     @AnnoOutputColumn
     private String custName;
 
-    @ApiParam("控制计划版本号")
+//    @ApiParam("控制计划版本号")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private Integer controlPlanVersion;
+//    private Integer controlPlanVersion;
-
-    @ApiParam("是否启用")
-    @AnnoOutputColumn
-    private Integer isEnable;
 
-//    @Column(name = "IS_ENABLE")
 //    @ApiParam("是否启用")
+//    @AnnoOutputColumn
 //    private Integer isEnable;
 
+
+    /**
+     * 中航质量标准明细表
+     */
     @ApiParam("工作单元代码")
     @AnnoOutputColumn
     private String workCellCode;
 
-    @ApiParam("质量标准版本")
+//    @ApiParam("质量标准版本")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private Integer qualityStandardVersion;
+//    private Integer qualityStandardVersion;
 
     //检测类型：10=首检，20=巡检，30=终检，40=发运检
     @ApiParam("检测类型")
@@ -87,11 +84,11 @@ public class MesControlPlanTemplateModel extends BaseBean {
 
     @ApiParam("是否允许让步")
     @AnnoOutputColumn
-    private String isConcession;
+    private Integer isConcession;
 
     @ApiParam("间隔时间")
     @AnnoOutputColumn
-    private String checkInterval;
+    private Integer checkInterval = 0;
 
     //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
     @ApiParam("个数标识")
@@ -119,11 +116,11 @@ public class MesControlPlanTemplateModel extends BaseBean {
 
     @ApiParam("公差上限")
     @AnnoOutputColumn
-    private BigDecimal differenceMaxLimit;
+    private Double maximum = 0d;
 
     @ApiParam("公差下限")
     @AnnoOutputColumn
-    private BigDecimal differenceMinLimit;
+    private Double minimum = 0d;
 
     @ApiParam("是否关键检测项")
     @AnnoOutputColumn

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListColorModel.java

@@ -12,4 +12,7 @@ public class MgnBoardListColorModel {
     @ApiParam("颜色")
     private String color;
 
+    @ApiParam("安灯类型")
+    private String alarmCode;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java

@@ -5,11 +5,7 @@ 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.Transient;
 
 /**
@@ -64,6 +60,9 @@ public class ProdOrgModel extends BaseBean {
     @ApiParam("工位类型")
     private Integer workCellType;
 
+    @ApiParam("工位等级:正常工位，监控工位")
+    private Integer grade;
+
     @Transient
     @ApiParam("序号")
     private Integer seq;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkOrderBiModel.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/12/9 19:09
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@Api("bi的工单model")
+public class WorkOrderBiModel {
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("零件名")
+    private String partName;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    public WorkOrderBiModel(String partNo, String partName, String workCenterCode, String workOrderNo) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.workCenterCode = workCenterCode;
+        this.workOrderNo = workOrderNo;
+    }
+}

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

@@ -719,4 +719,44 @@ public class MesPcnHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 按条件分页查询包装条码查询数据
+     *
+     * @param mesPackage
+     * @return
+     */
+    public static DdlPackBean getPackageSn(MesPackage mesPackage) {
+
+        DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesPackage.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getPackLevel())) {
+            DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+
+        if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        if(!CollectionUtils.isEmpty(mesPackage.getPackageNoList())){
+            DdlPreparedPack.getInPackList(mesPackage.getPackageNoList(), "packageNo", packBean);
+        }
+
+        DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean);
+
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesPackage.getCreateDateTimeStart(),
+                mesPackage.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+
+        return packBean;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java

@@ -59,8 +59,7 @@ public class SysOrderNoRule extends BaseBean {
 
     @Column(name = "SERIAL_NO_LENGTH")
     @ApiParam(value = "流水号长度",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
+    private Integer serialNoLength;
-    private Long serialNoLength;
 
     @Column(name = "IS_CYCLE")
     @ApiParam(value = "是否按日期循环", example = "1")

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

@@ -93,6 +93,11 @@ public class WmsCSRange extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     public String basZoneNo;
 
+    @Transient
+    @ApiParam("状态")
+    @AnnoOutputColumn(hidden = true)
+    public Integer orderStatus;
+
     public WmsCSRange(){}
 
     public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
@@ -108,4 +113,17 @@ public class WmsCSRange extends BaseBean {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
     }
+
+    public WmsCSRange(String zoneNo, String locateNo) {
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+
+    }
+
+    public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.zoneNo = zoneNo;
+        this.orderStatus = orderStatus;
+    }
 }

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

@@ -14,12 +14,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.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.Version;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -39,6 +34,9 @@ import javax.persistence.Version;
         @Index(columnList = "SRC_NO"),
         @Index(columnList = "ORGANIZE_CODE")
 })
+@Inheritance(
+        strategy = InheritanceType.JOINED
+)
 @Api("移库单明细表")
 public class WmsDocMovementDetails extends BaseBean {
     private static final long serialVersionUID = -4800308354250386102L;

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

@@ -13,11 +13,7 @@ import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -39,6 +35,9 @@ import java.util.List;
         @Index(columnList = "BUSI_TYPE"),
         @Index(columnList = "ORGANIZE_CODE")
 })
+@Inheritance(
+        strategy = InheritanceType.JOINED
+)
 @Api("移库单表")
 @ToString
 public class WmsDocMovementMaster extends BaseBean {

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

@@ -11,11 +11,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.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 移库单条码表
@@ -36,6 +32,9 @@ import javax.persistence.Transient;
         @Index(columnList = "SN"),
         @Index(columnList = "ORGANIZE_CODE")
 })
+@Inheritance(
+        strategy = InheritanceType.JOINED
+)
 @Api("移库条码信息")
 public class WmsDocMovementSn extends BaseBean {