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

5 years ago · 08125e3b0f
parent 2bc15b56ea c9b4b37c23
commit 08125e3b0f
37 changed files with 403 additions and 39 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/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;
+        }
+    }
 }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/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;
+        }
+
+    }
+
 }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/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;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java
@ -371,6 +371,8 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito

    boolean isExitByProperty(String[] propertyNames, Object[] values);

+    boolean isExitByPropertyDemo(String[] propertyNames, Object[] values);
+
    boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values);

    boolean isExitByHqlWhere(String hqlWhere);
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@ -651,6 +651,34 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
        }
    }

+
+    public int findByPropertyCountDemo(String[] propertyNames, Object[] values) {
+        if(propertyNames.length != values.length){
+            throw new IllegalArgumentException("参数错误数量和值个数不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
+        }
+        StringBuffer queryString = new StringBuffer();
+        queryString.append("select count(*) from " + persistentClass.getName() + " as model where 1=1 ");
+        for (int i = 0; i < propertyNames.length; i++) {
+            if(values[i] != null) {
+                queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]);
+            }
+        }
+
+        Query queryObject = entityManager.createQuery(queryString.toString(),Long.class);
+        for (int i = 0; i < propertyNames.length; i++) {
+            if(values[i] != null) {
+                queryObject.setParameter(propertyNames[i], values[i]);
+            }
+        }
+
+        try{
+            Long count = (Long) queryObject.getSingleResult();
+            return count == null ? 0 : count.intValue();
+        }catch(NoResultException e){
+            return 0;
+        }
+    }
+
    @Override
    public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
        if(pager != null){
@ -1439,6 +1467,11 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
    }

    @Override
+    public boolean isExitByPropertyDemo(String[] propertyNames, Object[] values) {
+        return findByPropertyCountDemo(propertyNames, values) > 0;
+    }
+
+    @Override
    public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) {
        return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0;
    }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
+++ b/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);
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
+++ b/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;
    }

    // 字段长度
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java
+++ b/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)
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
+++ b/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;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java
+++ b/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;

--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TjMgnBoardEquipmentMonitorModel.java
@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/9 15:35
+ * @desc
+ */
+@Data
+public class TjMgnBoardEquipmentMonitorModel {
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("横坐标")
+    private Double xAxes = 0d;
+
+    @ApiParam("纵坐标")
+    private Double yAxes = 0d;
+
+    @ApiParam("工位状态")
+    private String workCellStatus;
+
+    @ApiParam("颜色")
+    private String color;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
+++ b/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,10 +14,12 @@ import java.util.List;
 * @Modify:
 */
@Data
-public class BjBoardModel implements Serializable {
+public class MgnBjBoardModel implements Serializable {

    @ApiParam("jsa数量")
    private Integer jsaQty;
+    @ApiParam("jsa数量")
+    private Integer jsaRate;
    @ApiParam("完成数量")
    private Integer completeQty;
    @ApiParam("总数量")
@ -36,6 +39,8 @@ public class BjBoardModel implements Serializable {
    @ApiParam("x坐标内容")
    private List<String> xAxisList;

+    private Map<String, Object> resultMap;
+
    @ApiParam("显示数据")
-    private List<BjBoardSeriesModel> seriesModels;
+    private List<MgnBjBoardSeriesModel> seriesModels;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java
+++ b/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("显示数量")
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/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);
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java
+++ b/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;
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlProcedureColumnModel.java
+++ b/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;

--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java
+++ b/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;
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
+++ b/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
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
+++ b/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;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@ -53,10 +53,6 @@ public class WmsDocMovementDetails extends BaseBean {
    @ApiParam("行号")
    public String item;

-    @Column(name = "REF_ITEM")
-    @ApiParam("关联行号")
-    public Integer refItem;
-
    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
    @ColumnDefault("0")
    @ApiParam(value = "需求数量", example = "0")
@ -204,6 +200,7 @@ public class WmsDocMovementDetails extends BaseBean {
    @ApiParam("源单行号")
    public String srcItem;

+
    @Column(name = "CUST_ORDER_NO")
    @ApiParam("客户订单号")
    public String custOrderNo;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@ -112,6 +112,10 @@ public class WmsPOMaster extends BaseBean {
    @ApiParam(value = "发货日期")
    private String sendDate;

+    @Transient
+    @ApiParam(value = "实际到货时间")
+    private String arrDate;
+
    @Column(name = "IS_SN")
    @ApiParam(value = "是否生成条码", example = "1")
    public Integer isSn;
@ -177,6 +181,14 @@ public class WmsPOMaster extends BaseBean {
    private String partNo;

    @Transient
+    @ApiParam("需求数量")
+    private Double qty;
+
+    @Transient
+    @ApiParam("实收数量")
+    private Double rcqty;
+
+    @Transient
    private List<String> orderNoList;

    @Column(name = "DOCK", columnDefinition = "varchar(50) default ''")
@ -211,6 +223,10 @@ public class WmsPOMaster extends BaseBean {
    @ApiParam("容差")
    private Integer delayHour;

+    @Transient
+    @ApiParam("当前状态")
+    private String nowStatus;
+

    public WmsPOMaster() {

--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@ -110,6 +110,18 @@ public class WmsPOMasterDetails extends BaseBean {
    @ApiParam("计划交货时间")
    private String planTime;

+    @Transient
+    @ApiParam("当前状态")
+    private String nowStatus;
+
+    @Transient
+    @ApiParam(value = "实际到货日期")
+    private String arrDate;
+
+    @Transient
+    @ApiParam(value = "实际到货时间")
+    private String arrTime;
+
    @Column(name = "ERP_AREA_NO")
    @ApiParam("默认收货库存地")
    private String erpAreaNo;
@ -154,6 +166,16 @@ public class WmsPOMasterDetails extends BaseBean {
    private Boolean isSet = false;

    @Transient
+    @ApiParam("道口，临时使用")
+    private String dock;
+
+    @Transient
+    @ApiParam("收货状态，临时使用")
+    private String receiveStatus;
+
+
+
+    @Transient
    @ApiParam("供应商批次字段是否可编辑")
    private Boolean isDateCodeEdit = true;

@ -291,7 +313,7 @@ public class WmsPOMasterDetails extends BaseBean {
    }

    public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
-                              Double rcQty, Integer itemStatus) {
+                                Double rcQty, Integer itemStatus) {
        this.orderNo = orderNo;
        this.erpSrcNo = erpSrcNo;
        this.partNo = partNo;
@ -299,4 +321,16 @@ public class WmsPOMasterDetails extends BaseBean {
        this.rcQty = rcQty;
        this.itemStatus = itemStatus;
    }
+
+    public WmsPOMasterDetails(Integer poStatus,String dock,String orderNo,String vendorNo,String planDate,String planTime,Double qty,Double rcQty) {
+        this.orderNo = orderNo;
+        this.planDate=planDate;
+        this.planTime=planTime;
+        this.qty = qty;
+        this.rcQty = rcQty;
+        this.vendorNo=vendorNo;
+        this.dock=dock;
+        this.poStatus=poStatus;
+    }
+
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java
@ -173,6 +173,10 @@ public class WmsPartExtend extends BaseBean {
    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
    private String lastQcTime;

+    @Column(name = "CYCLE_IQC")
+    @ApiParam(value = "周期内免检", example = "1")
+    private Integer cycleIqc;
+
    public Integer getQcPassCount() {
        return this.qcPassCount == null ? 0 :this.qcPassCount.intValue();
    }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/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() {
    }

--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java
@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;

@ -68,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;
@ -114,4 +115,31 @@ public class WmsSuspenStockSync extends BaseBean {
    @ApiParam(value = "物料数据Map")
    private Map<String, WmsPart> partNameMap;

+    public String getLocateNoVal() {
+        return this.locateNo == null ? StringUtils.EMPTY : this.locateNo;
+    }
+
+    public String getPartNoAVal() {
+        return this.partNoA == null ? StringUtils.EMPTY : this.partNoA;
+    }
+
+    public String getPartNoBVal() {
+        return this.partNoB == null ? StringUtils.EMPTY : this.partNoB;
+    }
+
+    public Double getQtyAVal() {
+        return this.qtyA == null ? 0 : this.qtyA;
+    }
+
+    public Double getQtyBVal() {
+        return this.qtyB == null ? 0 : this.qtyB;
+    }
+
+    public String getLotNoAVal() {
+        return this.lotNoA == null ? StringUtils.EMPTY : this.lotNoA;
+    }
+
+    public String getLotNoBVal() {
+        return this.lotNoB == null ? StringUtils.EMPTY : this.lotNoB;
+    }
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -300,7 +300,10 @@ public class WmsHqlPack {
            DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),
                    wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
        }
-
+        if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),
+                    wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+        }
        getStringBuilderPack(wmsPOMaster, result);

        return result;
@ -2006,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);