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

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

@@ -107,4 +107,81 @@ public class SwebEnumUtil {
         }
     }
 
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_TYPE {
+        BOX(10, "BOX", "BOX（盒）"),
+        CARTON(20, "CARTON", "CARTON（箱）"),
+        PALLET(30, "PALLET", "PALLET（栈板）"),
+        CONTAINER(40, "PALLET", "PALLET（集装箱）");
+
+        private String code;
+        private String description;
+        int value;
+
+        PACKAGE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 订单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_TYPE {
+        CREATE(10, "标准包装"),
+        RECEIPT(20, "非标包装");
+
+        private int value;
+        private String description;
+
+        ORDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -656,7 +656,7 @@ public class WmsEnumUtil {
 
 
     /**
-     * 作业任务状态
+     * 作业任务状态、移库单条码操作状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
@@ -2031,4 +2031,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 单据是否指定条码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_IS_SN {
+        IS_APPOINT_SN(1, "指定条码"), APPOINT_SN(2, "不指定条码");
+
+        private int value;
+        private String description;
+
+        ORDER_IS_SN(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java

@@ -95,4 +95,8 @@ public class SwebPurchaseOrder extends BaseBean {
     @Column(name = "REF_ORDER_NO")
     @ApiParam(value = "关联单号")
     public String refOrderNo;
+
+    @Column(name = "EXPECTED_TIME")
+    @ApiParam(value = "预计到货时间")
+    public String expectedTime;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -130,9 +130,9 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam("是否为钢卷料")
     private Integer IS_STEEL;
 
-    @Column(name = "REC_TIME")
+    @Column(name = "EXPECTED_TIME")
     @ApiParam(value = "预计到货日期")
-    public String recTime;
+    public String expectedTime;
 
     @Column(name = "REMARK")
     @ApiParam("备注")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java

@@ -24,10 +24,10 @@ public class SwebPOForPubListEnterModel extends BaseBean {
     public Integer orderType;
 
     @ApiParam(value = "预计到货日期开始日期")
-    public String recTimeStart;
+    public String expectedTimeStart;
 
     @ApiParam(value = "预计到货日期结束日期")
-    public String recTimeEnd;
+    public String expectedTimeEnd;
 
     @ApiParam(value = "零件号")
     private String partNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -64,7 +64,7 @@ public class SwebHqlPack {
         DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
         DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
-        DdlPreparedPack.timeBuilder(model.getRecTimeStart(), model.getRecTimeEnd(), "recTime", result, false);
+        DdlPreparedPack.timeBuilder(model.getExpectedTimeStart(), model.getExpectedTimeEnd(), "expectedTime", result, false);
         // 封装有效状态和删除状态
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);

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

@@ -112,9 +112,13 @@ public class WmsDocMovementMaster extends BaseBean {
     private String desrAreaNo;
 
     @Column(name = "IS_PART")
-    @ApiParam(value = "是否散件")
+    @ApiParam(value = "是否散件", example = "1")
     private Integer isPart;
 
+    @Column(name = "IS_SN")
+    @ApiParam(value = "是否指定条码", example = "1")
+    private Integer isSn;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;
@@ -122,4 +126,8 @@ public class WmsDocMovementMaster extends BaseBean {
     @Transient
     @ApiParam(value = "打印时间")
     private String printDate;
+
+    public Integer getIsSn() {
+        return isSn == null ? 0 : this.getIsSn();
+    }
 }

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

@@ -58,10 +58,10 @@ public class WmsDocMovementSn extends BaseBean {
     public String unit;
 
     /**
-     * 状态:同库存条码状态一致
+     * 状态：操作状态
      */
     @Column(name="SN_STATUS")
-    @ApiParam(value = "状态", example = "10")
+    @ApiParam(value = "操作状态", example = "10")
     public Integer snStatus;
 
     @Column(name="SN")

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

@@ -111,4 +111,7 @@ public class WmsLocate extends BaseBean {
         return this.partQty == null ? 0 : this.partQty.doubleValue();
     }
 
+    public Integer getLocateType() {
+        return this.locateType== null ? 0 : this.locateType.intValue();
+    }
 }

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.wms.engine.rule;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+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;
+
+/**
+ * 业务规则持久化实体类
+ *
+ * @author Rock.Yu
+ * @since 2019-04-16 09:27
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "DROOLS_RULE_PERSISTENCE")
+@Api("系统动态业务规则")
+public class EngineRulePersistence extends BaseBean {
+    // 规则调用的唯一编号，例如：WMS_RECEIVE_0001
+    @Column(name = "RULE_NO", length = 50)
+    private String ruleNo;
+    // 规则的中文名称
+    @Column(name = "RULE_NAME", length = 50)
+    private String ruleName;
+    // 规则的具体内容
+    @Column(name = "RULE_CONTENT", columnDefinition = "TEXT")
+    private String ruleContent;
+    // 规则的描述，包含规则的用法，参数说明等
+    @Column(name = "RULE_REMARK", length = 2000)
+    private String ruleRemark;
+}

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 规则引擎持久化类
+ * @Reference :
+ * @Author : Rock.Yu
+ * @CreateDate : 2019-04-16 09:53
+ * @Modify:
+ **/
+@Repository
+public interface IEngineRulePersistenceRepository extends BaseRepository<EngineRulePersistence, Long> {
+    /**
+     * 按照规则编号查询规则实体
+     * @param ruleNo 规则编号
+     * @return 规则实体
+     */
+    EngineRulePersistence findByRuleNo(String ruleNo);
+}

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

@@ -7,10 +7,26 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+/**
+ * @Description : 脚本引擎持久化类
+ * @Reference :
+ * @Author : Rock.Yu
+ * @CreateDate : 2019-04-16 09:53
+ * @Modify:
+ **/
 @Repository
-public interface IEngineScriptPersistenceDao extends BaseRepository<EngineScriptPersistence, Long> {
+public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
+    /**
+     * 按照脚本编号查询脚本实体对象
+     * @param scriptNo 脚本编号
+     * @return 脚本实体对象
+     */
     EngineScriptPersistence findByScriptNo(String scriptNo);
 
+    /**
+     * 查找所有的脚本语言类型
+     * @return 数据库中已经存在的脚本语言类型
+     */
     @Query("select t.languageType from EngineScriptPersistence t group by t.languageType")
     List findGroupByLanguageType();
 }