Merge remote-tracking branch 'origin/dev' into dev

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

@@ -114,6 +114,7 @@ public class BlockSoftSwitchEnumUtil {
         SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
         SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
         CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
+        CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
 
         /* 数据源 */
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),

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

@@ -459,6 +459,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

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

@@ -422,6 +422,15 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static LOCATE_TYPE codeOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

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

@@ -88,7 +88,7 @@ public class MesWorkOrder extends BaseBean {
     private String scheduleDate;
 
     @Column(name="CUST_PROD_LINE_CODE")
-    @ApiParam("客户禅产线代码")
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @Column(name="SHIFT_CODE")

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

@@ -95,6 +95,10 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     /**********************  冗余字段 *********************************/
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -102,7 +102,7 @@ public class MesWorkOrder extends BaseBean {
     private String scheduleDate;
 
     @Column(name="CUST_PROD_LINE_CODE")
-    @ApiParam("客户禅产线代码")
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @Column(name="SHIFT_CODE")

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产计划导入异常结果model")
+public class MesPlanOrderExcelErrorModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产计划导入结果model")
+public class MesPlanOrderExcelResultModel implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功数量")
+    private int successNum;
+
+    @ApiParam("失败数量")
+    private int errorNum;
+
+    @ApiParam("错误信息集合")
+    private List<MesPlanOrderExcelErrorModel> mesPlanOrderExcelErrorModel;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+}

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

@@ -77,6 +77,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
             DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }
+        if (StringUtils.isNotEmpty(mesPlanOrder.getCustOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCustOrderNo(), "custOrderNo", packBean);
+        }
 
         // 时间段查询
         DdlPreparedPack.timeBuilder(

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -74,7 +74,7 @@ public class SysMenu extends BaseBean {
     @Column(name="MENU_SORT")
     @ApiParam(value ="资源排序", example = "0")
     @AnnoOutputColumn(required = false)
-    private Integer menuSort;
+    private Integer menuSort = 0;
 
     @Column(name="MENU_URL")
     @ApiParam(value ="资源 url" , access ="资源 url")

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

@@ -102,10 +102,21 @@ public class WmsLocate extends BaseBean {
     @Transient
     private String factory;
 
+    @Transient
+    @ApiParam(value = "入库箱数", example = "-1")
+    private Integer destBoxQty;
+
     @Column(name = "ENCRYPTION_NO")
     @ApiParam(value = "加密编码")
     private String encryptionNo;
 
+    public WmsLocate() {
+    }
+    public WmsLocate(String locateNo,Integer destBoxQty) {
+        this.locateNo = locateNo;
+        this.destBoxQty = destBoxQty;
+    }
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }

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

@@ -0,0 +1,45 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_PART_ROUTING")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物料线路关系表",description = "物料线路关系表")
+public class WmsPartRouting extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路编号")
+    private String areaNo;
+ 
+
+    public WmsPartRouting(){}
+
+}

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

@@ -0,0 +1,62 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ROUTING")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物流线路信息表",description = "物流线路信息表")
+public class WmsRouting extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路代码")
+    private String routingCode;
+
+    @Column(name = "ROUTING_NAME")
+    @ApiParam(value = "线路名称")
+    private String routingName;
+
+    @Column(name = "ROUTING_DESC")
+    @ApiParam(value = "线路描述")
+    private String routingDesc;
+
+    @Column(name = "FOR_PROUCT_CLASS")
+    @ApiParam(value = "适用产品分类")
+    private Integer forProductClass;
+
+    @Column(name = "FOR_WAREHOUSE")
+    @ApiParam(value = "适用仓库", example ="1")
+    private Integer forWareHouse;
+
+    @Column(name = "FOR_PRODUCT")
+    @ApiParam(value = "适用产品")
+    private Integer forProduct;
+
+   
+
+    public WmsRouting(){}
+
+}

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

@@ -0,0 +1,85 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ROUTING_RULE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物流线路规则表",description = "物流线路规则表")
+public class WmsRoutingRule extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "RULE_CODE")
+    @ApiParam(value = "规则编号")
+    private String ruleCode;
+
+    @Column(name = "RULE_NAME")
+    @ApiParam(value = "规则名称")
+    private String ruleName;
+
+    @Column(name = "RULE_DESC")
+    @ApiParam(value = "规则描述")
+    private String ruleDesc;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "排序号")
+    private Integer seq;
+
+    @Column(name = "RULE_TYPE")
+    @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10")
+    private Integer ruleType;
+
+    @Column(name = "ZONE_NO_SRC")
+    @ApiParam(value = "源存储区")
+    private String zoneNoSrc;
+
+    @Column(name = "ZONE_NO_TARGET")
+    @ApiParam(value = "目标存储区" , example = "2")
+    private String zoneNoTarget;
+
+    @Column(name = "OP_TYPE_CODE")
+    @ApiParam(value = "作业类型" , example = "2")
+    private String opTypeCode;
+
+    @Column(name = "TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型" , example = "1")
+    private String transTypeCode;
+
+    @Column(name = "MODE_CODE")
+    @ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作，40:自动操作 无交易)" , example = "1")
+    private Integer modeCode;
+
+    @Column(name = "DELAY_TIME")
+    @ApiParam(value = "延迟时间" , example = "1")
+    private Integer dalayTime;
+
+    @Column(name = "DELAY_UNIT")
+    @ApiParam(value = "延迟时间单位(M:分钟，D:天)")
+    private String delayUnit;
+
+   
+    public WmsRoutingRule(){}
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.engine.rule;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description : VDA收货 推荐入库
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-09-17 19:50
+ * @Modify:
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GenerateLocateRule {
+
+    /**
+     * 存储区
+     */
+    List<String> zonesList;
+
+    /**
+     * 库位类型
+     */
+    Integer locateType;
+
+    /**
+     * 工厂代码
+     */
+    String organizeCode;
+
+    /**
+     * 库位代码
+     */
+    String locateNo;
+
+    /**
+     * 入库箱数
+     */
+    Integer destQty;
+
+    /**
+     * 物料名称
+     */
+    String partNo;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.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.WmsPartRouting;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartRoutingRepository extends BaseRepository<WmsPartRouting ,Long> {
+
+ 
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.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.WmsRouting;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingRepository extends BaseRepository<WmsRouting ,Long> {
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.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.WmsRoutingRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingRoleRepository extends BaseRepository<WmsRoutingRule ,Long> {
+
+}