Merge branch 'dev' into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -333,6 +333,10 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "周发生次数")
     private int weekendsTime;
 
+    @Transient
+    @ApiParam(value = "事件统计报表该事件描述的总次数")
+    private int acCodeTime;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;
@@ -380,7 +384,9 @@ public class AndonManageQueue extends BaseBean {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
+    public AndonManageQueue(String acCode, String acNameRdd, String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){
+        this.acCode = acCode;
+        this.acNameRdd = acNameRdd;
         this.workCenterCode = workCenterCode;
         this.workCenterNameRdd = workCenterNameRdd;
         this.workCellCode = workCellCode;

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

@@ -363,8 +363,6 @@ public class AndonEnumUtil {
     }
 
 
-
-
     /**
      * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
      */

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

@@ -830,6 +830,10 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
     }
 
     /**

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +13,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * @Description:

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

@@ -363,6 +363,24 @@ public class MesHqlPack {
     }
 
     /**
+     * MES班组信息查询条件封装
+     * @param shiftGroup
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) {
+
+        DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode);
+        if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) {
+            DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
      * MES班次休息信息查询条件封装
      *
      * @param shiftRest

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

@@ -177,6 +177,19 @@ public class WmsMoveDetails extends BaseBean {
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
     public  Integer lockVersion;
+
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
+
    /* @JSONField(name="fPartNo")
     public String getfPartNo() {
         return fPartNo;

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

@@ -148,11 +148,22 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("获取数量大于0")
     private Integer qtyIdentity;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
 //    public  Integer lockVersion;
 
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(String orderNo, Integer orderStatus,  String transTypeCode, String errorMessage,

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

@@ -188,6 +188,17 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "乐观锁", example = "1")
     public  Integer lockVersion;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public WmsMoveSn() {
     }
 

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

@@ -37,7 +37,7 @@ public class WmsPartRouting extends BaseBean {
 
     @Column(name = "ROUTING_CODE")
     @ApiParam(value = "线路编号")
-    private String areaNo;
+    private String routingCode;
  
 
     public WmsPartRouting(){}

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

@@ -51,13 +51,13 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10")
     private Integer ruleType;
 
-    @Column(name = "ZONE_NO_SRC")
+    @Column(name = "SRC_ZONE_NO")
     @ApiParam(value = "源存储区")
-    private String zoneNoSrc;
+    private String srcZoneNo;
 
-    @Column(name = "ZONE_NO_TARGET")
+    @Column(name = "DEST_ZONE_NO")
     @ApiParam(value = "目标存储区" , example = "2")
-    private String zoneNoTarget;
+    private String destZoneNo;
 
     @Column(name = "OP_TYPE_CODE")
     @ApiParam(value = "作业类型" , example = "2")
@@ -79,7 +79,10 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "延迟时间单位(M:分钟，D:天)")
     private String delayUnit;
 
-   
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路代码")
+    private String routingCode;
+    
     public WmsRoutingRule(){}
 
 }

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

@@ -152,6 +152,16 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "移动单条码集合")
     private List<WmsMoveSn> wmsMoveSnList;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
+    public Integer getIsSnapshot() {
+        return this.isSnapshot == null ? 0 : this.isSnapshot;
+    }
 
     public String getAreaNo() {
         return areaNo;

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

@@ -239,12 +239,23 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "目标数量")
     public Double destQty;
 
+    @Transient
+    @ApiParam(value = "快照时间")
+    private String snapshotTime;
+
+    @Transient
+    private Integer isSnapshot;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){
         this.partNo = partNo;
     }
 
+    public Integer getIsSnapshot() {
+        return isSnapshot == null ? 0 : isSnapshot.intValue();
+    }
+
     public Integer getSnType() { return snType == null ? 0 : snType.intValue();}
 
     public Double getQty() {

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

@@ -218,7 +218,7 @@ public class WmsStockQuanSnapshot extends BaseBean {
 
     public WmsStockQuanSnapshot(String whNo, String zoneNo, String unit, String partNo, String partName,
                                 Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
-                                Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+                                Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty,String snapshotTime) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
@@ -235,6 +235,7 @@ public class WmsStockQuanSnapshot extends BaseBean {
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;
+        this.snapshotTime =snapshotTime;
     }
 
     public WmsStockQuanSnapshot(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockQuanSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsCheckPointRepository extends BaseRepository<WmsCheckPoint,Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveDetailsSnapshotRepository extends BaseRepository<WmsMoveDetailsSnapshot,Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveMasterSnapshotRepository extends BaseRepository<WmsMoveMasterSnapshot,Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsMoveSnSnapshotRepository extends BaseRepository<WmsMoveSnSnapshot,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.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.snapshot.WmsStockQuanSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 库存信息快照
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsStockQuanSnapshotRepository extends BaseRepository<WmsStockQuanSnapshot,Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description : 快照表
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/19 14:22
+* @Modify:
+*/
+
+@Repository
+public interface IWmsStockSnSnapshotRepository extends BaseRepository<WmsStockSnSnapshot,Long> {
+}

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

@@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface WmsRoutingRoleRepository extends BaseRepository<WmsRoutingRule ,Long> {
+public interface WmsRoutingRuleRepository extends BaseRepository<WmsRoutingRule ,Long> {
 
 }

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

@@ -2359,4 +2359,36 @@ public class WmsHqlPack {
 
         return result;
     }
+    
+    
+    
+    /**
+     * 业务：库存查询封装
+     *
+     * @param wmsStockQuan
+     * @return
+     */
+    public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {
+        DdlPackBean result = new DdlPackBean();
+
+     
+        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+  
+        getStringBuilderPack(wmsRouting, result);
+
+        return result;
+    }
+    
+    public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) {
+        DdlPackBean result = new DdlPackBean();
+
+     
+        DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result);
+//        DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
+  
+        getStringBuilderPack(wmsRoutingRule, result);
+
+        return result;
+    }
 }