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/PtlPcnEnumUtil.java

@@ -292,11 +292,12 @@ public class PtlPcnEnumUtil {
     public enum SIGNAL_CHILD_CMD {
         CHILD_CMD_06H("06", 6, "正常"),
         CHILD_CMD_07H("07", 7, "缺货"),
-        CHILD_CMD_09H("09", 9, "标签自检"),
-        CHILD_CMD_0AH("0A", 10, "亮灯错误"),
+        CHILD_CMD_09H("09", 9, "连接的现场设备的返回状态"),
+        CHILD_CMD_FFH("FF", 255, "无效消息"),
+        CHILD_CMD_0AH("0A", 10, "现场设备超时"),
         CHILD_CMD_0BH("0B", 11, "查询设备故障，返回设备故障"),
         CHILD_CMD_0CH("0C", 12, "设备无法执行命令,用错命令"),
-        CHILD_CMD_0DH("0D", 13, "卡键,按键卡住"),
+        CHILD_CMD_0DH("0D", 13, "返回按钮锁定消息,卡键,按键卡住"),
         CHILD_CMD_0FH("0F", 15, "返回库存模式下的缺货量"),
         CHILD_CMD_64H("64", 100, "熄灭情况下返回"),
         CHILD_CMD_FAH("FA", 250, "设备的 F/W 模型信息"),

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java

@@ -61,4 +61,8 @@ public class PtlAreaRouteModuleParam extends BaseBean implements Serializable {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     @ApiParam("参数值")
     private String paramValue;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
 }

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

@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.wms.bean.plugin;
+
+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 : 插件信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-03-17 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_PLUGIN")
+@Api("插件信息")
+public class BasPlugin extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592779L;
+    @Column(name="PLUGIN_NAME")
+    @ApiParam("插件名称")
+    private String pluginName;
+
+    @Column(name="PLUGIN_IMAGE")
+    @ApiParam("插件图片")
+    private String pluginImage;
+
+    @Column(name="PLUGIN_URL")
+    @ApiParam("插件URL地址")
+    private String pluginUrl;
+
+    @Column(name="PLUGIN_PATH")
+    @ApiParam("插件文件地址")
+    private String pluginPath;
+
+    @Column(name="PLUGIN_FILE_ID")
+    @ApiParam(value = "插件文件ID", example = "0")
+    private Long pluginFileId;
+
+    @Column(name="PLUGIN_DESC")
+    @ApiParam("插件描述")
+    private String pluginDesc;
+
+    @Column(name="SERVICE_NAME")
+    @ApiParam("服务名称")
+    private String serviceName;
+
+    @Column(name="REQUEST_URL")
+    @ApiParam("请求路径")
+    private String requestUrl;
+
+    @Column(name = "COPYRIGHT")
+    @ApiParam(value = "版权")
+    private Integer copyRight;
+
+    @Column(name = "AUTHOR")
+    @ApiParam(value = "作者")
+    private String author;
+
+    /**
+     *  插件安装状态 1-安装，2-卸载
+     */
+    @Column(name = "PLUGIN_STATUS")
+    @ApiParam(value = "插件状态", example = "1")
+    private Integer pluginStatus;
+
+    @Column(name = "PLUGIN_DIRECTORY")
+    @ApiParam(value = "本地插件文件夹")
+    private String pluginDirectory;
+
+    @Column(name = "PLUGIN_PACKAGE_NAME")
+    @ApiParam(value = "插件项目包名称")
+    private String pluginPackName;
+}

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.wms.bean.plugin;
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 插件类信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-03-17 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BAS_PLUGIN_CLASS")
+@Api("插件类信息")
+public class BasPluginClass extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592779L;
+    @Column(name="PLUGIN_ID")
+    @ApiParam(value = "插件编号", example = "0")
+    private Long pluginId;
+
+    @Column(name="BEAN_NAME")
+    @ApiParam("Bean名称")
+    private String beanName;
+
+    @Column(name="CLASS_NAME")
+    @ApiParam("插件类名称")
+    private String className;
+
+    @Lob
+    @Column(name="CLASS_BYTE", length = 100000)
+    @ApiParam("插件类字节码")
+    private byte[] classByte;
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPluginClass;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-03-17 15:17
+ * @Modify:
+ **/
+@Repository
+public interface BasPluginClassRepository extends BaseRepository<BasPluginClass, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-03-17 15:17
+ * @Modify:
+ **/
+@Repository
+public interface BasPluginRepository extends BaseRepository<BasPlugin, Long> {
+}

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

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo;
 import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction;
+import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin;
 import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
 import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
 import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
@@ -2859,4 +2860,18 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 插件信息分页查询条件
+     * @param plugin
+     * @return
+     */
+    public static DdlPackBean packHqlBasPlugin(BasPlugin plugin) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(plugin.getPluginName(), "pluginName", result);
+        DdlPreparedPack.getStringLikerPack(plugin.getAuthor(), "author", result);
+        DdlPreparedPack.getNumEqualPack(plugin.getPluginStatus(), "pluginStatus", result);
+        getStringBuilderPack(plugin, result);
+        return result;
+    }
+
 }