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

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

@@ -4961,7 +4961,8 @@ public class WmsEnumUtil {
         PLANNED_PULL(40, "计划拉动"),
         ANDON_PULL(50, "安灯拉动"),
         EXTERNAL_PULL(60, "手工拉动"),
-        WORKORDER_PULL(70, "工单拉动");
+        WORKORDER_PULL(70, "工单拉动"),
+        OVER_PULL(80, "过点拉动");
 
         private int value;
         private String description;

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/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/pom.xml

@@ -102,4 +102,4 @@
         <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
-</project>
+</project>

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

@@ -131,9 +131,6 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "是否重置")
     private Integer isReset;
 
-//    @ApiParam(value = "任务编号")
-//    private String taskNo;
-
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

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

@@ -216,6 +216,9 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "产品条码")
     private String serialNumber;
 
+    @Column(name = "IS_GENERATE_PICKING", columnDefinition = "int default 2")
+    @ApiParam("是否已经生成领料单")
+    public Integer isGeneratePicking;
 
 
 

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

@@ -180,4 +180,18 @@ public class WmsQCMaster extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.createDatetime = createDatetime;
     }
+
+    public WmsQCMaster(String orderNo,String refSrc,String remark,String vendorNo,String vendorDesc,String partNo,String partNameRdd,Double qty,Integer orderStatus,Integer qcStatus,String createDatetime) {
+        this.orderNo = orderNo;
+        this.refSrc = refSrc;
+        this.remark = remark;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+        this.partNo = partNo;
+        this.qty = qty;
+        this.orderStatus = orderStatus;
+        this.partNameRdd = partNameRdd;
+        this.qcStatus = qcStatus;
+        this.createDatetime = createDatetime;
+    }
 }