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

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

@@ -17,9 +17,8 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_JIS_PATTERN_TYPE {
-        ONE(10, "一套发运"),
-        TRUE(20, "多套发运"),
-        FALSE(30, "单产品多套发运");
+        ONE_PROD(10, "单产品发运"),
+        MANY_PROD(20, "多产品发运");
 
         private int value;
         private String description;
@@ -49,6 +48,41 @@ public class MesEnumUtil {
     }
 
     /**
+     * JIS发运产品组扫描顺序类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_JIS_SCAN_SEQ_TYPE {
+        ONE_PROD(10, "整发"),
+        MANY_PROD(20, "单发");
+
+        private int value;
+        private String description;
+
+        MES_JIS_SCAN_SEQ_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;
+        }
+    }
+
+    /**
      * 是否解析
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+/**
+ * @Description :JIS发运模式
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-12-25
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_JIS_PATTERN")
+@Api("JIS发运模式")
+public class MesJisPattern extends BaseBean {
+
+    @Column(name = "PATTERN_NO")
+    @ApiParam("模式编号")
+    private String patternNo;
+
+    @Column(name = "PATTERN_NAME")
+    @ApiParam("模式名称")
+    private String patternName;
+
+    @Column(name = "RULE")
+    @ApiParam("规则")
+    private String rule;
+
+    @Column(name = "DESC")
+    @ApiParam("描述")
+    private String desc;
+
+    @Column(name = "TOP_NO")
+    @ApiParam("一次显示TOP数")
+    private Integer topNo;
+
+    @Column(name = "HANDLE_NO")
+    @ApiParam("一次处理套数")
+    private Integer handleNo;
+
+    @Column(name = "PATTERN_TYPE")
+    @ApiParam("模式类型")
+    private Integer patternType;
+
+    @Column(name = "SCAN_SEQ_TYPE")
+    @ApiParam("产品组扫描顺序类型")
+    private Integer scanSeqType;
+
+}

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+/**
+ * @Description :JIS发运队列
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-12-24
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIS")
+@Api("JIS发运队列")
+public class MesQueueJis extends BaseBean {
+
+    @Column(name = "JIS_NO")
+    @ApiParam("主队列编号")
+    private String jisNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "VIN_CODE")
+    @ApiParam("vin")
+    private String vinCode;
+
+    @Column(name = "CAR_NO")
+    @ApiParam("车号")
+    private String carNo;
+
+    @Column(name = "SEQ")
+    @ApiParam("排序")
+    private Double seq;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+}

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+/**
+ * @Description :JIS发运队列明细
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-12-24
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QUEUE_JIS_DETAIL")
+@Api("JIS发运队列明细")
+public class MesQueueJisDetail extends BaseBean {
+
+    @Column(name = "JIS_NO")
+    @ApiParam("主队列编号")
+    private String jisNo;
+
+    @Column(name = "PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesJisPattern;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-12-25
+ * @Modify:
+ **/
+@Repository
+public interface MesJisPatternRepository extends BaseRepository<MesJisPattern, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJisDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-12-25
+ * @Modify:
+ **/
+@Repository
+public interface MesQueueJisDetailRepository extends BaseRepository<MesQueueJisDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJis;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-12-25
+ * @Modify:
+ **/
+@Repository
+public interface MesQueueJisRepository extends BaseRepository<MesQueueJis, Long> {
+}

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

@@ -2098,5 +2098,31 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * JIS发运模式
+     * @param jisPattern
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode);
+        if (!StringUtils.isEmpty(jisPattern.getPatternNo())) {
+            DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean);
+        }
+        if (!StringUtils.isEmpty(jisPattern.getTopNo())) {
+            DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean);
+        }
+        if (!StringUtils.isEmpty(jisPattern.getHandleNo())) {
+            DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean);
+        }
+        if (!StringUtils.isEmpty(jisPattern.getPatternType())) {
+            DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean);
+        }
+        if (!StringUtils.isEmpty(jisPattern.getScanSeqType())) {
+            DdlPreparedPack.getNumEqualPack(jisPattern.getScanSeqType(), "scanSeqType", packBean);
+        }
+        return packBean;
+    }
+
 
 }

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

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 库区物料
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ZONE_PART")
+@Api("库区物料")
+public class WmsZonePart extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592546L;
+    @Column(name="ZONE_NO")
+    @ApiParam("存储区编号")
+    private String zoneNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="PULL_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "拉动数量", example = "0")
+    private Double pullQty;
+
+    @Column(name="MAX", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "最大值", example = "0")
+    private Double max;
+
+    @Column(name="MIN", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "最小值", example = "0")
+    private Double min;
+
+    @Column(name = "IS_GENERATE_PICKLIST")
+    @ApiParam(value = "是否生成领料单", example = "2")
+    private Integer isGeneratePickList;
+
+    @Column(name="MOQ", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "起订量", example = "0")
+    private Double moq;
+
+    @Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "安全量", example = "0")
+    private Double safetyQty;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.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.BasCustomer;
+import cn.estsh.i3plus.pojo.wms.bean.WmsZonePart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :库区物料
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-12-30 17:27
+ * @Modify:
+ **/
+@Repository
+public interface WmsZonePartRepository extends BaseRepository<WmsZonePart,Long> {
+}

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

@@ -2660,4 +2660,21 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 库区物料信息分页查询条件
+     *
+     * @param wmsZonePart
+     * @return
+     */
+    public static DdlPackBean packHqlWmsZonePart(WmsZonePart wmsZonePart) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsZonePart.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsZonePart.getZoneNo(), "zoneNo", result);
+
+        getStringBuilderPack(wmsZonePart, result);
+
+        return result;
+    }
+
 }