Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.util.Objects;
+
 /**
  * @Description : 模块表单枚举类
  * @Reference :
@@ -2301,7 +2303,6 @@ public class BlockFormEnumUtil {
         }
     }
 
-
     /**
      * 操作触发来源
      */
@@ -2397,4 +2398,75 @@ public class BlockFormEnumUtil {
         }
     }
 
+    /**
+     * 对象原始属性类型
+     * TABLE_COL（10）：表格列-表，视图与存储过程查询结果的显示列
+     * PROCEDURE_IN_PARAM（20）：入参-存储过程的入参
+     * PROCEDURE_INOUT_PARAM（30）：入参-存储过程的出入参（sqlserver没有出参，都算出入参）
+     * PROCEDURE_OUT_PARAM（40）：入参-存储过程，函数的出参
+     * PROCEDURE_RETURN（50）：入参-存储过程，函数的返回值（mysql存储过程没有返回值，sqlserver有）
+     *
+     */
+    public enum ORIGIN_PROPERTY_TYPE {
+        NORMAL_PROPERTY(10,  "正常属性"),
+        PROCEDURE_IN_PARAM(20,  "入参"),
+        PROCEDURE_INOUT_PARAM(30,  "出入参"),
+        PROCEDURE_OUT_PARAM(40,  "出参"),
+        PROCEDURE_RETURN(50,  "返回值");
+
+        private final int value;
+        private final String description;
+
+        private ORIGIN_PROPERTY_TYPE (int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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 static ORIGIN_PROPERTY_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static ORIGIN_PROPERTY_TYPE procColTypeValOf(int procColTypeVal) {
+            ORIGIN_PROPERTY_TYPE result = NORMAL_PROPERTY;
+            switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))){
+                case IN_PARAM:
+                    result = PROCEDURE_IN_PARAM;
+                    break;
+                case INOUT_PARAM:
+                    result = PROCEDURE_INOUT_PARAM;
+                    break;
+                case OUT_PARAM:
+                    result = PROCEDURE_OUT_PARAM;
+                    break;
+                case RETURN_PARAM:
+                    result = PROCEDURE_RETURN;
+                    break;
+            }
+            return result;
+        }
+    }
 }

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

@@ -228,7 +228,7 @@ public class BlockSoftSwitchEnumUtil {
         SCHEDULE(2,"定时调度"),
         RABBITMQ(3,"MQ 调用"),
         HTTP(4,"接口调用"),
-        CLOUD(5,"Cloud调用"),
+        CLOUD(5,"微服务调用"),
         REST(6,"REST调用"),
         WEB_SERVICE(7,"WebService"),
         SOCKET(8,"socket"),
@@ -1161,4 +1161,49 @@ public class BlockSoftSwitchEnumUtil {
 
     }
 
+    /**
+     * 适配重试方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SUIT_RETRY_STATUS {
+        NOT_RETRY(10, "未重试"),
+        RETRY(20, "已重试");
+
+        private int value;
+        private String description;
+
+        private BS_SUIT_RETRY_STATUS (int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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 static BS_SUIT_RETRY_STATUS valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+    }
+
 }

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

@@ -3656,7 +3656,9 @@ public class MesEnumUtil {
     public enum QUEUE_ORDER_DETAIL_STATUS {
 
         NORMAL(10, "正常"),
-        CLOSE(20, "关闭");
+        CLOSE(20, "关闭"),
+        FINISH(30, "完成"),
+        OFF_LINE_REWORK(40, "线下返修");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -278,11 +278,15 @@ public class DdlPreparedPack {
     }
 
     /**
-     * 封装String对象成equal语句
-     *
+     * 不建议使用该方法，其他方法已满足需要
+     * @see #getStringLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
+     * @see #getStringLikerPackOr(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
+     * @see #getStringLeftLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
+     * @see #getStringRightLikerPack(java.lang.String, java.lang.String, cn.estsh.i3plus.pojo.base.bean.DdlPackBean)
      * @param columnName 列名
      * @param packBean
      */
+    @Deprecated
     public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
             packBean.addColumnQuery(columnName, " and model." + columnName + " like  :m_" + columnName, val);

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -8,6 +10,7 @@ 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;
 
@@ -53,9 +56,16 @@ public class BfDataObjectProperty extends BaseBean {
     private String objectColumnName;
 
     // 暂用来区分存储过程出入参数信息
-    @Column(name="OTHER_COLUMN_TYPE")
-    @ApiParam(value ="其他列类型")
-    private Integer otherColumnType;
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
+    @ColumnDefault("10")
+    @Column(name="ORIGIN_PROPERTY_TYPE")
+    @ApiParam(value ="原始列类型")
+    private Integer originPropertyType;
+
+    public String getOriginPropertyTypeTxt() {
+        return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
+                : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
+    }
 
     @Column(name="OBJECT_COLUMN_TYPE")
     @ApiParam(value ="数据对象类型")
@@ -74,7 +84,7 @@ public class BfDataObjectProperty extends BaseBean {
     private Integer isNullable;
 
     public Integer getIsNullableVal(){
-        return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable.intValue();
+        return isNullable == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isNullable;
     }
 
     // 字段长度

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java

@@ -30,6 +30,8 @@ import javax.persistence.Table;
 @Api(value = "表单拾取属性", description = "表单拾取属性")
 public class BfElementPickUpProperty extends BaseBean {
 
+    private static final long serialVersionUID = -1071243642582327905L;
+
     @Column(name = "PICK_UP_PROPERTY_ID")
     @ApiParam(value = "拾取属性id", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java

@@ -2,12 +2,14 @@ package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 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;
 
@@ -49,6 +51,18 @@ public class BfElementProperty extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long dataObjectPropertyId;
 
+    // 暂用来区分存储过程出入参数信息
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
+    @ColumnDefault("10")
+    @Column(name="ORIGIN_PROPERTY_TYPE")
+    @ApiParam(value ="原始列类型")
+    private Integer originPropertyType;
+
+    public String getOriginPropertyTypeTxt() {
+        return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
+                : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
+    }
+
     @Column(name="PROPERTY_TYPE")
     @ApiParam(value ="属性类型")
     private Integer propertyType;

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

@@ -157,6 +157,10 @@ public class IfProductOffLine extends BaseBean implements Serializable {
     @ApiParam("BaseModule零件号")
     private String baseModule;
 
+    @Column(name = "QUEUE_GROUP_FLAG")
+    @ApiParam("分组标识")
+    private String queueGroupFlag;
+
     public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) {
         this.partNo = partNo;
         this.packageNo = packageNo;

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

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description: MES控制计划-主表
+ * @Description: MES控制计划-主表（子表：质量标准MES_QUALITY_STANDARD）
  * @CreateDate: 2020/9/27
  * @Author: simon.song
  */

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

@@ -96,6 +96,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     private Integer alreadyLandedNum;
 
     @Transient
+    @ApiParam("当前库存")
+    private Integer currentStock;
+
+    @Transient
     @ApiParam("物料名称")
     private String partName;
 }

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

@@ -53,4 +53,8 @@ public class MesTypeCfg extends BaseBean implements Serializable {
     @Column(name = "SEQ")
     @ApiParam("顺序")
     private Integer seq;
+
+    @Column(name = "DEFECT_ACTION_TYPE")
+    @ApiParam("不良处理类型")
+    private String defectActionType;
 }

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

@@ -379,7 +379,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private Integer endCheckQty;
 
     @Transient
-    @ApiParam("终检数量")
+    @ApiParam("打包数量")
     private Integer finalInspectionQty;
 
     @Transient

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AssembleDefectModel {
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("抛光层级model")
+    private AssembleDefectModel polishingModel;
+
+    @ApiParam("拆解层级model")
+    private AssembleDefectModel disassembleModel;
+
+    @ApiParam("不良类型集合")
+    private List<AssembleDefectModel> defectModelList;
+
+    @ApiParam("类型代码")
+    private String typeCode;
+
+    @ApiParam("类型名称")
+    private String typeName;
+
+    @ApiParam("不良集合")
+    private List<MesDefect> defectList;
+
+}

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

@@ -1,16 +1,14 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
-import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
 
 /**
- * @Description: 条码解绑实体
+ * @Description: 异步任务model
  * @Reference:
- * @Author: siliter.yuan
+ * @Author: wangjie
  * @CreateDate: 2020-06-28-11:44
  * @Modify:
  **/
@@ -20,15 +18,6 @@ public class FutrueTaskModel<T> {
     @ApiParam("实现类")
     private Object futrueTaskService;
 
-    @ApiParam("工位请求bean")
-    private StationRequestBean stationRequestBean;
-
-    @ApiParam("产品条码表")
-    private MesProduceSn produceSn;
-
-    @ApiParam("产品绑定记录表")
-    private MesProdBindRecord prodBindRecord;
-
     @ApiParam("组织代码")
     private String organizeCode;
 
@@ -38,12 +27,10 @@ public class FutrueTaskModel<T> {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @ApiParam("总装批量执行逻辑")
-    private List<T> requestBeanList;
-
-    @ApiParam("总装批量执行逻辑")
-    private Object specialBusinessType;
-
+    @ApiParam("数据")
+    private Object Obj;
 
+    @ApiParam("集合")
+    private List<T> list;
 
 }

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

@@ -29,6 +29,6 @@ public class MesBoardWorkCenterOverviewModel {
     @ApiParam("工单列表")
     List<MesWorkOrder> workOrderList;
 
-    @ApiParam("班组列表")
+    @ApiParam("班组信息")
     List<MesShiftGroup> shiftGroupList;
 }

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

@@ -27,6 +27,9 @@ public class MgnBoardAssembleCompRateModel {
     @ApiParam("实际OEE")
     private String finaOee;
 
+    @ApiParam("OEE红线值")
+    private String oeeRedLineValue;
+
     @ApiParam("缺陷名称")
     private String defectName;
 

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

@@ -20,19 +20,19 @@ public class MgnBoardListModel {
     @ApiParam("当班实际产量")
     private Double shiftActualYield;
 
-    @ApiParam("当前时间分钟")
+    @ApiParam("时间小时")
     private String currentMinTime;
 
     /**
-     * 开班时间到当前时间按分钟累计计划数量
+     * 开班时间到当前时间按小时累计计划数量
      */
-    @ApiParam("每分钟计划产量")
+    @ApiParam("每小时计划产量")
     private Double minPlanYield;
 
     /**
-     * 开班时间到当前时间按分钟累计实际数量
+     * 开班时间到当前时间按小时累计实际数量
      */
-    @ApiParam("每分钟实际产量")
+    @ApiParam("每小时实际产量")
     private Double minActualYield;
 
     @ApiParam("计划完成率")

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

@@ -28,6 +28,12 @@ public class SkillsUserModel {
     @ApiParam(value ="工号")
     private String userEmpNo;
 
+    @ApiParam(value ="工位")
+    private String workCellCode;
+
+    @ApiParam(value ="产线")
+    private String workCenterCode;
+
     @ApiParam("技能矩阵信息")
     private List<MesUserSkill> mesUserSkillList;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -13,12 +14,17 @@ import java.util.List;
  * @Modify:
  */
 @Data
-public class BjBoardModel implements Serializable {
+public class MgnBjBoardModel implements Serializable {
 
+    private Integer qty;
     @ApiParam("jsa数量")
     private Integer jsaQty;
+    @ApiParam("jsa数量")
+    private Integer jsaRate;
     @ApiParam("完成数量")
     private Integer completeQty;
+    @ApiParam("完成率")
+    private Integer completeRate;
     @ApiParam("总数量")
     private Integer totalQty;
     @ApiParam("预警数量")
@@ -30,12 +36,17 @@ public class BjBoardModel implements Serializable {
     @ApiParam("一次合格率")
     private Integer onceQualityRate = 0;
 
+    @ApiParam(value = "显示颜色")
+    private String color;
+
     @ApiParam("x坐标内容")
     private String xAxis;
 
     @ApiParam("x坐标内容")
     private List<String> xAxisList;
 
+    private Map<String, Object> resultMap;
+
     @ApiParam("显示数据")
-    private List<BjBoardSeriesModel> seriesModels;
+    private List<MgnBjBoardSeriesModel> seriesModels;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java

@@ -10,7 +10,7 @@ import lombok.Data;
  * @Modify:
  */
 @Data
-public class BjBoardSeriesModel {
+public class MgnBjBoardSeriesModel {
     @ApiParam("名称")
     private String name;
     @ApiParam("显示数量")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Pn;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part;
 import lombok.Data;
 
 import java.util.List;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java

@@ -16,6 +16,8 @@ public class OeeModel {
 
     private Integer standardTakt;
 
+    private Double planOee;
+
     private String color;
 
     private Double threshold = 0.03;

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

@@ -241,10 +241,10 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
-            DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
-            DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
         }
         if (mesQueueOrder.getQueueType() != null) {
             DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean);
@@ -708,6 +708,27 @@ public class MesHqlPack {
     }
 
     /**
+     * MES工步信息查询条件封装
+     *
+     * @param staff
+     * @return
+     */
+    public static DdlPackBean getStaff(MesStaff staff, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(staff, organizeCode);
+        if (!StringUtils.isEmpty(staff.getUserCode())) {
+            DdlPreparedPack.getStringLikerPack(staff.getUserCode(), "userCode", packBean);
+        }
+        if (!StringUtils.isEmpty(staff.getUserName())) {
+            DdlPreparedPack.getStringLikerPack(staff.getUserName(), "userName", packBean);
+        }
+        if (!StringUtils.isEmpty(staff.getSkillLevel())) {
+            DdlPreparedPack.getNumEqualPack(staff.getSkillLevel(), "skillLevel", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES工步参数信息查询条件封装
      *
      * @param stepParam

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -43,6 +45,18 @@ public class SqlColumnModel implements Serializable {
     // 字段精确长度
     @ApiParam(value = "字段精确长度")
     private Integer scale;
+
+    // 暂用来区分存储过程出入参数信息
+    // 暂用来区分存储过程出入参数信息
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.class)
+    @ApiParam(value ="原始列类型")
+    private Integer originPropertyType;
+
+    public String getOriginPropertyTypeTxt() {
+        return originPropertyType == null ? BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.NORMAL_PROPERTY.getDescription()
+                : BlockFormEnumUtil.ORIGIN_PROPERTY_TYPE.valueOfDescription(originPropertyType);
+    }
+
     // 字段类型编号
     @ApiParam(value = "字段类型编号")
     private Integer columnType;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -32,6 +34,7 @@ public class SqlProcedureColumnModel {
      * 4是出参
      * 5是返回值（函数）
      */
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.PROCEDURE_COL_TYPE.class)
     @ApiParam(value = "列类型")
     private Integer columnType;
 
@@ -41,6 +44,10 @@ public class SqlProcedureColumnModel {
     @ApiParam(value = "数据类型名称")
     private String typeName;
 
+    // 字段Java 类型
+    @ApiParam(value = "字段Java 类型")
+    private String className;
+
     @ApiParam(value = "长度")
     private Integer length;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java

@@ -60,4 +60,21 @@ public class WmsMessageStyleModel implements Serializable {
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
         }
     }
+
+    public WmsMessageStyleModel(String message, double transQty, double actQty, boolean showRed) {
+        this.message = message;
+        if (actQty == 0) {//未处理
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue();
+        } else if (transQty > actQty) {//处理中
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
+        } else if (actQty == transQty) {//处理完成
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
+        } else if (transQty < actQty) {//处理数量大于需求数量-显示红色
+            if (showRed) {
+                this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CLOSED.getValue();
+            } else {
+                this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
+            }
+        }
+    }
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java

@@ -3,12 +3,13 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 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;
@@ -26,7 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "BS_SUIT_FILE")
-@Api(value = "适配文件信息", description = "适配文件信息")
+@ApiModel(value = "适配文件信息", description = "适配文件信息")
 public class BsSuitFile extends BaseBean {
 
     private static final long serialVersionUID = -5476684791619434327L;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -5,10 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 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;
 
@@ -34,7 +35,7 @@ import java.util.Map;
         @Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"),
         @Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"),
 })
-@Api(value = "适配记录", description = "适配记录")
+@ApiModel(value = "适配记录", description = "适配记录")
 public class BsSuitRecord extends BaseBean {
 
     private static final long serialVersionUID = 174969165955420968L;
@@ -157,6 +158,26 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "处理结果")
     private String processResult;
 
+    @ColumnDefault(value = "10")
+    @Column(name = "RETRY_STATUS")
+    @ApiParam(value = "重试状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.class)
+    private Integer retryStatus;
+
+    public String getRetryStatusTxt() {
+        return retryStatus == null ? BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.NOT_RETRY.getDescription() :
+                BlockSoftSwitchEnumUtil.BS_SUIT_RETRY_STATUS.valueOfDescription(retryStatus);
+    }
+
+    @ColumnDefault(value = "0")
+    @Column(name = "RETRY_NUM")
+    @ApiParam(value = "重试状态")
+    private Integer retryNum;
+
+    public int getRetryNumVal() {
+        return retryNum == null ? 0 : retryNum;
+    }
+
     /************************************** 临时属性 ***************************************/
 
     @Transient

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -320,7 +320,7 @@ public class SoftSwitchHqlPack {
 
         DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
-        DdlPreparedPack.getStringLikePack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
@@ -330,9 +330,10 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getRequestSource(), "requestSource", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getRetryRecordId(), "retryRecordId", ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
-
         ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());
 
         return ddlPackBean;

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

@@ -88,6 +88,11 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("批次编号")
     public String lotNo;
 
+    @Column(name = "LEFT_CODE")
+    @ApiParam(value = "生产批次")
+    private String leftCode = "";
+
+
     @Column(name = "PACKAGE_NO")
     @ApiParam("容器编号")
     public String packAgeNo;
@@ -407,9 +412,10 @@ public class WmsMoveSn extends BaseBean {
     }
 
 
-    public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) {
+    public WmsMoveSn(String sn, String refSrc,String transTypeCode, String transTypeName, Integer itemStatus) {
         this.sn = sn;
         this.refSrc = refSrc;
+        this.transTypeCode = transTypeCode;
         this.transTypeName = transTypeName;
         this.itemStatus = itemStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.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.Entity;
-import javax.persistence.Table;
-import javax.persistence.Version;
+import javax.persistence.*;
 
 /**
  * @Description : 质检单明细信息
@@ -86,4 +83,8 @@ public class WmsQCDetails extends BaseBean {
     @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
+
+    @Transient
+    @ApiParam(value = "供应商编号")
+    public String vendorNo;
 }

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

@@ -14,7 +14,11 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -529,6 +533,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("数量总和")
     private Double sumQty;
 
+    @Transient
+    @ApiParam("原数量")
+    private Double srcQty;
+
     public WmsStockSn() {
     }
 

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

@@ -69,7 +69,7 @@ public class WmsSuspenStockSync extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private Double qtyA;
 
-    @Column(name = "qty_b")
+    @Column(name = "QTY_B")
     @ApiParam(value = "数量B")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private Double qtyB;

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

@@ -2009,7 +2009,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsConfig(WmsConfig wmsConfig) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsConfig.getConfigCode(), "configCode", result);
         DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result);
         DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result);
         DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result);