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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmStatusModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/30 22:18
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FsmStatusModel {
+
+    private String from;
+
+    private String to;
+
+    private String event;
+
+    private Object context;
+
+    private String status;
+
+}

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

@@ -128,7 +128,7 @@ public class BlockSoftSwitchEnumUtil {
 //        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_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"),
-
+        CLIENT_WEB_SERVICE_HUAYU(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140005,"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/CommonEnumUtil.java

@@ -64,6 +64,7 @@ public class CommonEnumUtil {
          * 计划排产服务
          */
         APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"),
+        APS_2(18, 18400, 25, 180000000L, "i3aps-2", "高级计划与排产-2"),
         SURFACE(98, 0, 0, 0, "i3surface", "对外服务"),
 
         /**

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/HandleCallBackParam.java

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/9/8 17:41
+ * @Modify:
+ **/
+@Data
+@ApiModel("方法回到")
+public class HandleCallBackParam implements Serializable {
+
+    private static final long serialVersionUID = 42L;
+    @ApiModelProperty(name = "日志ID")
+    private long logId;
+    @ApiModelProperty(name = "成功失败标志1成功，2失败")
+    private int handleCode;
+    @ApiModelProperty(name = "方法执行日志")
+    private String handleMsg;
+
+}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java

@@ -25,4 +25,6 @@ public class RequestModel {
     private String methodHandlerKey;
     @ApiModelProperty("方法的入参")
     private Map<String, Object> jsonParamMap;
+    @ApiModelProperty("日志id")
+    private Long logId;
 }

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.po;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.thoughtworks.xstream.converters.extended.NamedMapConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/9/8 17:01
+ * @Modify:
+ **/
+@Table(name = "METHOD_LOG")
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("方法调用日志")
+public class MethodLog extends BaseBean implements Serializable {
+
+    @ApiModelProperty("调用方法名冗余字段")
+    @Column(name = "METHOD_NAME_RDD")
+    private String methodNameRdd;
+
+    @ApiModelProperty("方法id")
+    @Column(name = "METHOD_ID")
+    private Long methodId;
+
+    @ApiModelProperty("方法参数")
+    @Column(name = "METHOD_PARAMS")
+    private String methodParam;
+
+    @ApiModelProperty("方法调用日志信息")
+    @Column(name = "MESSAGE",columnDefinition = " text ")
+    private String message;
+
+    @ApiModelProperty("方法是否执行成功")
+    @Column(name = "SUCCESS")
+    private Integer success;
+}

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :Dashboard  总方法数、总应用数、总实例数（总数，启用数，禁用数）
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/9/8 14:44
+ * @Modify:
+ **/
+@ApiModel("Dashboard数据")
+@Data
+public class DashboardSummaryVo {
+
+    @ApiModelProperty("总方法数")
+    private Integer totalMethodNum;
+    @ApiModelProperty("启用方法数")
+    private Integer enableMethodNum;
+    @ApiModelProperty("禁用方法数")
+    private Integer disableMethodNum;
+
+    @ApiModelProperty("总应用数")
+    private Integer totalAppNum;
+    @ApiModelProperty("启用应用数")
+    private Integer enableAppNum;
+    @ApiModelProperty("禁用方法数")
+    private Integer disableAppNum;
+
+    @ApiModelProperty("总实例数")
+    private Integer totalInstanceNum;
+    @ApiModelProperty("启动实例数")
+    private Integer enableInstanceNum;
+    @ApiModelProperty("禁用实例数")
+    private Integer disableInstanceNum;
+
+}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLogRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.bsp.server.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.bsp.server.bean.po.MethodLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/9/8 17:13
+ * @Modify:
+ **/
+@Repository
+public interface MethodLogRepository extends BaseRepository<MethodLog,Long> {
+}

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

@@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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.*;
 import java.io.Serializable;
 
 /**
@@ -41,6 +37,10 @@ public class MesScatterBomCfg extends BaseBean implements Serializable {
     @ApiParam("客户零件号")
     private String customerPartNo;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
     @Column(name = "PART_LOCATION1")
     @ApiParam("产品位置1")
     private String partLocation1;
@@ -92,4 +92,5 @@ public class MesScatterBomCfg extends BaseBean implements Serializable {
     @Column(name = "CHANGE_NO")
     @ApiParam("change No")
     private String changeNo;
+
 }

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

@@ -5,8 +5,6 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -41,6 +39,11 @@ import java.util.List;
 public class MesWorkOrder extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3566003375267865064L;
 
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+
     @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("工单号")
     private String orderNo;
@@ -440,8 +443,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private Integer ngQty;
 
 
-
-
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -214,6 +214,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("密码")
     private String password;
 
+    @ApiParam("缓存来源文件")
+    private String cacheSourceClass;
+
     public StationRequestBean() {
     }
 
@@ -252,6 +255,7 @@ public class StationRequestBean implements Serializable {
                 ", finishCount=" + finishCount +
                 ", packageNo=" + packageNo +
                 ", createDatetime=" + createDatetime +
+                ", cacheSourceClass=" + cacheSourceClass +
                 '}';
     }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysRoleModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
+import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author ns
+ * @create 2021/11/3 0003 下午 17:31
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户角色关联model")
+public class SysRoleModel implements Serializable {
+    private SysRole sysRole;
+    private Pager pager;
+}

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :冷热数据分离消息队列消息
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/9/23 13:59
+ * @Modify:
+ **/
+@Data
+@Api(value = "冷热分离消息")
+public class DataSeparatorMessage implements Serializable {
+
+    private static final long serialVersionUID = -1;
+
+    private Long id;
+
+    private String refClass;
+
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -986,7 +986,9 @@ public class CoreHqlPack {
 
         // hql拼接
         DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
+//        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
+        //2021-10-19 修改成模糊查询
+        DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateGroupId(), "templateGroupId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateSoftType(), "templateSoftType", ddlPackBean);
 
@@ -1340,4 +1342,4 @@ public class CoreHqlPack {
         return ddlPackBean;
     }
 
-}
+}

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -124,6 +126,11 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("收货批次")
     public String lotNo = "";
 
+    @Column(name = "package_no")
+    @ApiParam(value = "包装编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String packageNo;
+
     @Transient
     @ApiParam(value = "实盘数量", example = "1")
     @AnnoOutputColumn(hidden = true)

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

@@ -8,15 +8,11 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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.*;
 
 /**
  * @Description : 物料子检测项
@@ -82,4 +78,8 @@ public class WmsPartItemCheck extends BaseBean {
     @ApiParam("最小值")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double min;
+
+    @Column(name = "INPUT_METHOD")
+    @ApiParam("录入方式")
+    private Integer inputMethod;
 }

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

@@ -1481,6 +1481,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringLikeEqualPack(wmsCSOrderDetails.getPackageNo(), "packageNo", result);
         DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result);
         DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
@@ -1507,6 +1508,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
+        DdlPreparedPack.getStringLikeEqualPack(wmsCSFactTrans.getPackageNo(), "packageNo", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);