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/AndonEnumUtil.java

@@ -80,10 +80,11 @@ public class AndonEnumUtil {
 
 
     /**
-     * 状态点界面编号
+     * 状态点界面编号--此部分枚举后续要创建一个表存储。
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ROUTE_STATUS_INTERFACE_NO {
+        DEFAULT_ALARM_CALL("DEFAULT_ALARM_CALL", "默认呼叫无界面"),
         EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"),
         QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"),
         PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"),

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

@@ -17,7 +17,8 @@ public class BlockFormEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FORM_TABLE_TYPE {
         TABLE(1, "TABLE", "表"),
-        VIEW(2, "VIEW", "视图");
+        VIEW(2, "VIEW", "视图"),
+        PROCEDURE(3, "PROCEDURE", "存储过程");
 
         private int value;
         private String code;
@@ -2347,4 +2348,53 @@ public class BlockFormEnumUtil {
         }
     }
 
+    /**
+     * 存储过程列类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCEDURE_COL_TYPE {
+        IN_PARAM(1,  "入参"),
+        INOUT_PARAM(2,  "出入参"),
+//        ?(3,  "按钮"),
+        OUT_PARAM(4,  "出参"),
+        RETURN_PARAM(5,  "返回值");
+
+        private int value;
+        private String description;
+
+        private PROCEDURE_COL_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 PROCEDURE_COL_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;
+        }
+    }
+
 }

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

@@ -12,6 +12,39 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_IS_SEALED {
+
+        UNSEALED(1, "未封箱"),
+        SEALED(2, "已封箱");
+
+        private int value;
+        private String description;
+
+        PACKAGE_IS_SEALED(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;
+        }
+    }
+
     /**
      * MES_SPC关键数据
      */

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

@@ -9005,7 +9005,8 @@ public class WmsEnumUtil {
         FINISH(10, "已完成(绿色)"),
         OVER_TIME(20, "已超时（红色）"),
         UNRECEIVED(30, "未收货（蓝色）"),
-        VARIANT(40, "有差异（黄色）");
+        VARIANT(40, "有差异（黄色）"),
+        NORMAL(50, "正常（白色）");
 
         private int value;
         private String description;

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

@@ -2,6 +2,7 @@ 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;
@@ -61,6 +62,7 @@ public class BfDataObject extends BaseBean {
     @ApiParam(value ="表状态(是否同步)")
     private Integer objectStatus;
 
+    @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TABLE_TYPE.class)
     @Column(name="OBJECT_TYPE")
     @ApiParam(value ="数据类型")
     private Integer objectType;

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

@@ -52,6 +52,11 @@ public class BfDataObjectProperty extends BaseBean {
     @ApiParam(value ="数据对象列名称")
     private String objectColumnName;
 
+    // 暂用来区分存储过程出入参数信息
+    @Column(name="OTHER_COLUMN_TYPE")
+    @ApiParam(value ="其他列类型")
+    private Integer otherColumnType;
+
     @Column(name="OBJECT_COLUMN_TYPE")
     @ApiParam(value ="数据对象类型")
     private Integer objectColumnType;

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

@@ -72,18 +72,34 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否新增")
     private Integer isObjectAdd;
 
+    public boolean isObjectAdd(){
+        return isObjectAdd != null && isObjectAdd == BlockFormEnumUtil.ELEMENT_ADD_STATUS.ON.getValue();
+    }
+
     @Column(name = "IS_OBJECT_EDIT")
     @ApiParam(value = "是否编辑")
     private Integer isObjectEdit;
 
+    public boolean isObjectEdit(){
+        return isObjectEdit != null && isObjectEdit == BlockFormEnumUtil.ELEMENT_EDIT_STATUS.ON.getValue();
+    }
+
     @Column(name = "IS_OBJECT_DEL")
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    public boolean isObjectDel(){
+        return isObjectDel != null && isObjectDel == BlockFormEnumUtil.ELEMENT_DEL_STATUS.ON.getValue();
+    }
+
     @Column(name = "IS_OBJECT_DEL_WEAK")
     @ApiParam(value = "是否弱删除")
     private Integer isObjectDelWeak;
 
+    public boolean isObjectDelWeak(){
+        return isObjectDelWeak != null && isObjectDelWeak == BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.ON.getValue();
+    }
+
     public Integer getIsObjectDelWeakVal(){
         return isObjectDelWeak == null ? BlockFormEnumUtil.ELEMENT_DELETE_WEAK_STATUS.OFF.getValue() : isObjectDelWeak.intValue();
     }
@@ -100,6 +116,10 @@ public class BfElement extends BaseBean {
         return isObjectValid == null ? BlockFormEnumUtil.ELEMENT_VALID_STATUS.OFF.getValue() : isObjectValid.intValue();
     }
 
+    public boolean isObjectValid(){
+        return isObjectValid != null && isObjectValid == BlockFormEnumUtil.ELEMENT_VALID_STATUS.ON.getValue();
+    }
+
     @Column(name = "ELEMENT_VALID_ATTR_ID")
     @ApiParam(value = "元素有效属性id")
     private Long elementValidAttrId;
@@ -112,6 +132,10 @@ public class BfElement extends BaseBean {
         return isOrganizeIsolation == null ? BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.OFF.getValue() : isOrganizeIsolation.intValue();
     }
 
+    public boolean isOrganizeIsolation(){
+        return isOrganizeIsolation != null && isOrganizeIsolation == BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.ON.getValue();
+    }
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;

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

@@ -93,6 +93,20 @@ public class MesBom extends BaseBean implements Serializable {
     @ApiParam(value = "已拆解数量")
     public Double scrapQty = 0d;
 
+    @Transient
+    @ApiParam("合格数")
+    private Double okQty = 0d;
+
+    @Transient
+    @ApiParam("缺失数")
+    private Double missQty = 0d;
+
+    @Transient
+    @ApiParam("报废数")
+    private Double wasteQty = 0d;
+
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -200,5 +200,24 @@ public class MesQueueOrder extends BaseBean implements Serializable {
         this.workType = workType;
         this.orderNo = orderNo;
     }
+    public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty,
+                               Integer queueType,Integer status,String createUser,
+                         String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo,
+                         String workCenterCode, String workCellCode) {
+        this.seq = seq;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.boxQty = boxQty;
+        this.queueType = queueType;
+        this.status = status;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.workType = workType;
+        this.orderNo = orderNo;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+    }
 
 }

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

@@ -23,4 +23,10 @@ public class MgnBoardListModel {
     @ApiParam("计划完成率")
     private String planCompleteRate;
 
+    @ApiParam("异常数量")
+    private Integer exceptQty;
+
+    @ApiParam("正常数量")
+    private Integer normalQty;
+
 }

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

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnPackageSnTraceReportModel {
+
+    @ApiParam("箱条码")
+    private String packageNo;
+
+    @ApiParam("托条码")
+    private String packageNo2;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料编号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam("是否封箱")
+    private Integer isSealed;
+
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
+
+    @ApiParam(value = "工厂")
+    public String organizeCode;
+
+    @ApiParam(value="修改日期查询用，查询起始日期")
+    public String createDateTimeStart;
+
+    @ApiParam(value = "修改日期查询用，查询结束日期")
+    public String createDateTimeEnd;
+
+    public MgnPackageSnTraceReportModel() {
+    }
+
+    public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) {
+        this.packageNo = packageNo;
+        this.packageNo2 = packageNo2;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.isSealed = isSealed;
+        this.createDatetime = createDatetime;
+        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
+    }
+}

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

@@ -45,4 +45,10 @@ public class OperateObjectParamModel {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @ApiParam(value = "安灯状态代码")
+    private String statusCode;
+
+    @ApiParam("设备状态集合")
+    private List<OperateObjectParamModel> objectParamModelList;
+
 }

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 存储过程列模型
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-10-21 19:00
+ * @Modify:
+ **/
+@Data
+public class SqlProcedureColumnModel {
+
+    @ApiParam(value = "过程")
+    private String procedureCat;
+
+    @ApiParam(value = "过程方案")
+    private String procedureSchem;
+
+    @ApiParam(value = "过程名称")
+    private String procedureName;
+
+    @ApiParam(value = "列名")
+    private String columnName;
+
+    /**
+     * 1是入参
+     * 2是出入参
+     * 3是？
+     * 4是出参
+     * 5是返回值（函数）
+     */
+    @ApiParam(value = "列类型")
+    private Integer columnType;
+
+    @ApiParam(value = "数据类型")
+    private Integer dataType;
+
+    @ApiParam(value = "数据类型名称")
+    private String typeName;
+
+    @ApiParam(value = "长度")
+    private Integer length;
+
+    @ApiParam(value = "精度")
+    private Integer scale;
+
+    @ApiParam(value = "是否允许为空")
+    private Integer nullable;
+
+    @ApiParam(value = "备注")
+    private String remarks;
+
+    /**
+     * 0为返回值
+     * 1为首位
+     */
+    @ApiParam(value = "顺序位置")
+    private Integer ordinalPosition;
+
+
+}

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

@@ -415,6 +415,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("箱数")
     private Double boxQty;
 
+    @Transient
+    @ApiParam("窗口领料开始时间")
+    private String windowPickStartTime;
+
+    @Transient
+    @ApiParam("窗口领料结束时间")
+    private String windowPickEndTime;
+
     public WmsDocMovementDetails () {
 
     }
@@ -542,4 +550,14 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.boxQty = boxQty;
         this.srcLocateNo = srcLocateNo;
     }
+
+    public WmsDocMovementDetails(String orderNo, Integer orderStatus, Double qty, Double pickQty, String modifyDatetime, String planTime) {
+        this.orderNo = orderNo;
+        this.orderStatus = orderStatus;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.modifyDatetime = modifyDatetime;
+        this.planTime = planTime;
+    }
+
 }

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

@@ -354,6 +354,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("目标库位代码")
     public String destLocateNo;
 
+
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }

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

@@ -0,0 +1,79 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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 javax.persistence.Transient;
+
+/**
+ * @Description : 领料时长分区
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-10-21 19:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PICKING_WINDOW_TIME")
+@Api("领料时长分区")
+public class WmsPickingWindowTime extends BaseBean {
+
+    private static final long serialVersionUID = 9214639813072592714L;
+
+    @Column(name = "SHIFT_NO")
+    @ApiParam("班次编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String shiftNo;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
+    private String endTime;
+
+    @Column(name = "LATEST_END_TIME")
+    @ApiParam("最晚领料时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
+    private String latestEndTime;
+
+    @Transient
+    @ApiParam("班次开始时间")
+    private String shiftStartTime;
+
+    @Transient
+    @ApiParam("班次结束时间")
+    private String shiftEndTime;
+
+
+    public WmsPickingWindowTime() {
+    }
+
+    public WmsPickingWindowTime(Long id, String shiftNo, String startTime, String endTime, String latestEndTime, String shiftStartTime, String shiftEndTime) {
+        this.id = id;
+        this.shiftNo = shiftNo;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.latestEndTime = latestEndTime;
+        this.shiftStartTime = shiftStartTime;
+        this.shiftEndTime = shiftEndTime;
+
+    }
+
+}

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 班次表
@@ -51,4 +52,9 @@ public class WmsShift extends BaseBean{
     @ApiParam("结束时间")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
     private String endTime;
+
+    @Transient
+    @ApiParam("结束时间&结束时间")
+    private boolean startTimeAndEndTime;
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickingWindowTimeRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPickingWindowTime;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :领料时长分区
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-10-21 19:21
+ * @Modify:
+ **/
+@Repository
+public interface WmsPickingWindowTimeRepository extends BaseRepository<WmsPickingWindowTime, Long> {
+}

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

@@ -48,7 +48,6 @@ public class WmsHqlPack {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
-
         DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
         if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
@@ -2817,7 +2816,10 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result);
         DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result);
-
+        if (wmsShift.isStartTimeAndEndTime() && !StringUtil.isEmpty(wmsShift.getStartTime())) {
+            result.setWhereAppend(result.getWhereAppend() + " and model.startTime<='" + wmsShift.getStartTime() + "'");
+            result.setWhereAppend(result.getWhereAppend() + " and model.endTime>='" + wmsShift.getStartTime() + "'");
+        }
         getStringBuilderPack(wmsShift, result);
 
         return result;
@@ -3526,4 +3528,21 @@ public class WmsHqlPack {
 
         return result;
     }
+
+
+    /**
+     * 领料时长分区分页查询条件
+     *
+     * @param wmsPickingWindowTime
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPickingWindowTime(WmsPickingWindowTime wmsPickingWindowTime) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsPickingWindowTime.getShiftNo(), "shiftNo", result);
+
+        getStringBuilderPack(wmsPickingWindowTime, result);
+
+        return result;
+    }
 }