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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 甘特图分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
+@Data
+@Api("甘特图分页查询参数")
+public class GanttPager extends Pager {
+    public static class SortData {
+        // 排序对象
+        private String field;
+        // 排序类型，1为升序，0为降序
+        private Boolean ascending;
+
+        public String getField() {
+            return field;
+        }
+
+        public void setField(String field) {
+            this.field = field;
+        }
+
+        public Boolean getAscending() {
+            return ascending;
+        }
+
+        public void setAscending(Boolean ascending) {
+            this.ascending = ascending;
+        }
+    }
+    private String filter;
+    private List<SortData> sorts;
+}

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

@@ -12,6 +12,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    /**
+     * JIS发运模式类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_JIS_PATTERN_TYPE {
+        ONE(10, "一套发运"),
+        TRUE(20, "多套发运"),
+        FALSE(30, "单产品多套发运");
+
+        private int value;
+        private String description;
+
+        MES_JIS_PATTERN_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;
+        }
+    }
 
     /**
      * 是否解析
@@ -2386,82 +2421,6 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes按钮状态配置 判断符号
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_BUTTON_STATUS_JUDGE_FLAG {
-
-        EQUAL("=", "等于"),
-        NOT_EQUAL("!=", "不等于"),
-        GREATER_THAN(">", "大于"),
-        NOT_LESS_THAN(">=", "大于大于"),
-        LESS_THAN("<", "小于"),
-        NOT_GREATER_THAN("<=", "小于等于");
-
-        private String value;
-        private String description;
-
-        MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(String val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
-     * mes按钮状态配置 逻辑符号
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_BUTTON_STATUS_LOGIC_FLAG {
-
-        AND("&&", "逻辑与"),
-        OR("||", "逻辑或");
-
-        private String value;
-        private String description;
-
-        MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(String val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * MesWorkOrder实体对应的approvalStatus值  审批状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+@Documented
+public @interface UseMongoDb {
+}

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

@@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean {
     @ApiParam("实体类名称")
     private String ClassName;
 
-    @Column(name = "STATUS_FIELD")
-    @ApiParam("状态字段")
-    private String statusField;
-
-    @Column(name = "JUDGE_FLAG")
-    @ApiParam("判断符合")
-    private String judgeFlag;
-
-    @Column(name = "STATUS_VALUE")
-    @ApiParam("状态值")
-    private String statusValue;
-
-    @Column(name = "LOGIC_FLAG")
-    @ApiParam("逻辑符合")
-    private String logicFlag;
+    @Column(name = "APPEND_HQL")
+    @ApiParam("拼接HQL")
+    private String appendHql;
 
     @Column(name = "STATUS_DESC")
     @ApiParam("描述")

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,6 +34,7 @@ import javax.persistence.Transient;
         @Index(columnList = "OBJECT_CODE"),
         @Index(columnList = "MODIFY_DATE_TIME")
 })
+//@UseMongoDb
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java

@@ -0,0 +1,15 @@
+//package cn.estsh.i3plus.pojo.mes.repositorymongo;
+//
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
+//import cn.estsh.i3plus.pojo.mes.bean.MesProductData;
+//import org.springframework.stereotype.Repository;
+//
+///**
+// * @Author: Wynne.Lu
+// * @CreateDate: 2019/12/25 1:30 下午
+// * @Description:
+// **/
+//@Repository
+//public interface MesProductDataRepository extends BaseMongoRepository<MesProductData, Long> {
+//}

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

@@ -2097,4 +2097,6 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+
 }

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

@@ -181,6 +181,23 @@ public class WmsCSFactTrans extends BaseBean {
         this.srcZoneNo = srcZoneNo;
         this.srcWhNo = srcWhNo;
     }
+
+    public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo,String vendorNo) {
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.factQty = factQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.qty = qty;
+        this.unit = unit;
+        this.srcLocateNo = srcLocateNo;
+        this.srcZoneNo = srcZoneNo;
+        this.srcWhNo = srcWhNo;
+        this.vendorNo= vendorNo;
+    }
     public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
         this.partNo=partNo;
         this.partNameRdd = partNameRdd;

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

@@ -208,7 +208,8 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("优先级")
-    private String priority;
+    private Integer priority;
+
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -272,8 +273,10 @@ public class WmsDocMovementDetails extends BaseBean {
         this.destLocateNo = destLocateNo;
     }
 
-    public WmsDocMovementDetails (String partNo) {
+    public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) {
         this.partNo = partNo;
+        this.priority = priority;
+        this.orderNo = orderNo;
     }
 
     public WmsDocMovementDetails (String partNo,String orderNo) {

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

@@ -8,10 +8,7 @@ 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.UniqueConstraint;
+import javax.persistence.*;
 
 /**
  * @Description : 附件表
@@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{
     @Column(name = "REF_TYPE")
     @ApiParam(value = "关联单据类型")
     private String refType;
+
+    @Transient
+    @ApiParam("预览前缀")
+    public String previewPrefix;
 }

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

@@ -62,6 +62,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "处理数量", example = "0")
     public Double transQty;
 
+    @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "已处理数量", example = "0")
+    public Double handledQty;
+
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }

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

@@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean {
     private String prodCfgTypeName;
 
     @Transient
-    @ApiParam(value = "箱数", example = "-1")
+    @ApiParam(value = "箱数")
     private Integer boxQty;
 
     @Transient
-    @ApiParam(value = "零件数", example = "-1")
+    @ApiParam(value = "零件数")
     private Double partQty;
 
     @Transient
+    @ApiParam(value = "处理中数量")
+    private Double transQty;
+
+    @Transient
     @ApiParam(value = "ERP库存地")
     private String areaNo;
 
@@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean {
         this.consignQty = consignQty;
         this.lockQty = lockQty;
         this.scrapQty = scrapQty;
+        this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
     }
 }

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

@@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("是否寄售 1-是 2-否")
     private Integer consignation;
 
+    @Transient
+    @ApiParam(value = "是否最早批次")
+    public String isFifo;
+
     public WmsStockSn() {
     }
 

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

@@ -1613,7 +1613,9 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
-        DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
+                new String[]{"sn", "createDatetime"}, result);
         return result;
     }
 
@@ -2427,7 +2429,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
 
-        DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
         DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
         // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
         DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);