Merge branch 'test' into ext-dev

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

@@ -2129,7 +2129,9 @@ public class WmsEnumUtil {
         NUMBER(10, "数字"),
         STRING(20, "字符串"),
         CONFIGURABLE_STR(25, "可配字符串"),
-        OUT_OR_UNNECESSARY(30, "出参或者不必需的参数");
+        OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"),
+        COMPONET(40,"组件"),
+        SCRIPT(50,"脚本");
 
         private int value;
         private String description;

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Api("执行器注册的信息")
 public class RegistryParam  implements Serializable {
     @ApiParam("执行器的名称")
-    private Integer appType;
+    private String appname;
     @ApiParam("执行器的地址")
     private String address;
     @ApiParam(value = "注册类型 1:自动 2:手动", defaultValue = "1")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java

@@ -30,9 +30,9 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable
 
     private static final long serialVersionUID = -3871002350228229604L;
 
-    @Column(name = "APP_TYPE")
+    @Column(name = "APP_NAME")
     @ApiModelProperty("执行器组的applicationType")
-    private Integer appType;
+    private String appName;
 
     @Column(name = "ADDRESS_STR")
     @ApiModelProperty("注册地址字符串，地址用逗号间隔")
@@ -46,9 +46,9 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable
     @ApiModelProperty("执行器组路由策略,默认随机")
     private String routeStrategy;
 
-    @Column(name = "UPDATE_TIME")
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
+//    @Column(name = "UPDATE_TIME")
+//    @ApiModelProperty("更新时间")
+//    private Date updateTime;
 
     @Column(name = "SOFT_TYPE")
     @ApiModelProperty("应用该类型")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java

@@ -29,9 +29,9 @@ import java.util.Date;
 public class ExecutorRegistryInfo extends BaseBean implements Serializable {
     private static final long serialVersionUID = -736085114778936163L;
 
-    @Column(name = "APP_TYPE")
+    @Column(name = "APP_NAME")
     @ApiModelProperty("执行器类型,代替appName")
-    private Integer appType;
+    private String appName;
 
     @Column(name = "ADDRESS")
     @ApiModelProperty("执行器地址，包含ip:port")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java

@@ -30,8 +30,8 @@ public class ExecutorRegistryMethodDocInfo extends BaseBean implements Serializa
     private static final long serialVersionUID = 2770821289940006535L;
 
     @ApiModelProperty(value = "应用类型")
-    @Column(name = "APP_TYPE")
-    private Integer appType;
+    @Column(name = "APP_NAME")
+    private String appName;
 
     @Lob
     @ApiModelProperty(value = "markdown文本，前端渲染")
@@ -46,27 +46,5 @@ public class ExecutorRegistryMethodDocInfo extends BaseBean implements Serializa
     @Lob
     @Column(name = "CLASSIFICATION")
     private String classification;
-//    @Column(name = "BEAN_NAME")
-//    @ApiModelProperty("beanName")
-//    private String beanName;
-//
-//    @Column(name = "VERSION")
-//    @ApiModelProperty("方法版本")
-//    private String version;
-//
-//    @Column(name = "AFFECT_TABLE_STR")
-//    @ApiModelProperty("受影响的表名,逗号分割，原来为数组")
-//    private String affectTableClassNameStr;
-//
-//    @Column(name = "SYSTEM_PROCESS_STR")
-//    @ApiModelProperty("系统要执行的逻辑 逗号分割，原来为数组")
-//    private String systemProcessStr;
 
-//    @Column(name = "VALIDATION")
-//    @ApiModelProperty("参数验证 逗号分割，原来为数组")
-//    private String validation;
-
-//    @Column(name = "METHOD_ID")
-//    @ApiModelProperty("方法ID")
-//    private Long methodId;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java

@@ -46,9 +46,9 @@ public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable
     @ApiModelProperty("方法的版本号")
     private String version;
 
-    @Column(name = "APP_TYPE")
+    @Column(name = "APP_NAME")
     @ApiModelProperty("所属执行器的appType")
-    private Integer appType;
+    private String appName;
 
     @Column(name = "METHOD_TYPE")
     @ApiModelProperty("方法类型，属于那个执行器类型,同枚举类method_group_type")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodModel.java

@@ -27,4 +27,7 @@ public class InvokeMethodModel {
 
     @ApiParam("方法的入参map")
     private Map<String,Object> params;
+
+    @ApiParam("方法入参为json")
+    private String paramsJson;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/GroupValidVo.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class GroupValidVo {
 
     @ApiModelProperty("执行器组的id列表")
-    private List<Long> idList;
+    private List<Long> ids;
 
     @ApiModelProperty("执行器组的状态")
     private Integer isValid;

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/MethodStatusVo.java

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/2/16 9:41
+ * @Modify:
+ **/
+@Data
+@ApiModel(value = "方法启用、禁用")
+public class MethodStatusVo {
+
+    public List<Long> ids;
+    public Integer isValid;
+}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/dao/IRegistryGroupDao.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.bsp.server.dao;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/2/16 10:48
+ * @Modify:
+ **/
+public interface IRegistryGroupDao {
+
+    /**
+     * 获取所有的应用名称
+     * @return
+     */
+    List<String> getAllAppNames();
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java

@@ -11,11 +11,8 @@ 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 : 主数据齿轮

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java

@@ -35,6 +35,8 @@ public class WmsAgImportModel implements Serializable {
     List<WmsActionModuleParam> ampList;
     @ApiParam("作业步骤参数类型集合")
     List<WmsActionStepType> astList;
+    @ApiParam("作业脚本参数集合")
+    List<EngineScriptPersistence> scriptList;
     @ApiParam("工厂代码")
     public String organizeCode;
     @ApiParam("是否覆盖")

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import lombok.Data;
@@ -33,28 +34,34 @@ public class EngineScriptPersistence extends BaseBean {
     private static final long serialVersionUID = 7893111140559759490L;
     // 脚本调用的唯一编号，例如：WMS_PDA_0001
     @Column(name = "SCRIPT_NO", length = 50)
+    @AnnoOutputColumn(name = "脚本编码")
     private String scriptNo;
 
     // 脚本的中文名称
     @Column(name = "SCRIPT_NAME", length = 50)
+    @AnnoOutputColumn(name = "脚本名称")
     private String scriptName;
 
     // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
     @Column(name = "SCRIPT_TYPE")
+    @AnnoOutputColumn(name = "脚本类型")
     private Integer scriptType;
 
     // 脚本编写的语言
     // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
     @Column(name = "LANGUAGE_TYPE")
+    @AnnoOutputColumn(name = "脚本语言")
     private Integer languageType;
 
     // 脚本的具体内容
     @Lob
     @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
+    @AnnoOutputColumn(name = "脚本内容")
     private String scriptContent;
 
     // 脚本的描述，包含脚本的用法，参数说明等
     @Column(name = "SCRIPT_REMARK", length = 2000)
+    @AnnoOutputColumn(name = "脚本描述",required = false)
     private String scriptRemark;
 
     // 编译后的脚本内容，通过预编译加快脚本的运行速度

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

@@ -60,7 +60,7 @@ public class WmsActionModule extends BaseBean {
     @ApiParam(value = "作业类型")
     public String opTypeCode;
 
-    @Column(name = "IS_SHOW_INFO", nullable = false)
+    @Column(name = "IS_SHOW_INFO", columnDefinition = "int default 2")
     @ApiParam(value = "是否实现回显")
     @AnnoOutputColumn
     public Integer isShowInfo;

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

@@ -241,7 +241,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getFourthRemake(), "fourthRemake", packBean);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getAssignPlanDate(), "assignPlanDate", packBean);
-        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getAssignSrcZoneNo(),"assignSrcZoneNo",packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getRemark(),"remark",packBean);
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
         return packBean;