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

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

@@ -44,4 +44,8 @@ public class MesBypassMapping extends BaseBean implements Serializable {
     @Column(name = "IS_DISPLAY")
     @ApiParam("是否显示")
     private Integer isDisplay;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
 }

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

@@ -32,6 +32,11 @@ import java.io.Serializable;
 @Api("关键件条码校验规则")
 public class MesKpsnRule extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2592621267902381297L;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.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;
 
 @Data
@@ -37,4 +33,8 @@ public class MesPartProdCfgType extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
+
+    @Column(name = "CUST_PART_NO")
+    @ApiParam("客户零件号")
+    private String custPartNo;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java

@@ -42,4 +42,9 @@ public class SuitModel implements Serializable {
     @ApiParam(value = "适配器参数")
     private List<BsSuitCaseParam> bsSuitCaseParamList;
 
+    @ApiParam(value = "请求id")
+    private String requestId;
+
+    @ApiParam(value = "业务id列表")
+    private List<String> busiIdList;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -108,6 +108,9 @@ public class SuitServerModel implements Serializable {
 //    @XStreamImplicit
     private Integer suitMethodId;
 
+
+
+
     public int getSuitMethodIdVal() {
         if (suitMethodId == null) {
             return -1;
@@ -118,6 +121,16 @@ public class SuitServerModel implements Serializable {
     //    @XStreamImplicit
     private String analyzeMessage;
 
+    /**
+     * 业务id列表
+     */
+    private List<String> busiIdList;
+
+    /**
+     * 适配是否重复
+     */
+    private Boolean duplicate;
+
     public SuitServerModel(){
     }
     public SuitServerModel(SuitModel suitModel){
@@ -126,5 +139,8 @@ public class SuitServerModel implements Serializable {
         this.suitSid= suitModel.getSuitSid();
         this.retryRecordId = suitModel.getRetryRecordId();
         this.obj = suitModel.getParamXml();
+        this.requestId = suitModel.getRequestId();
+        this.busiIdList = suitModel.getBusiIdList();
+        this.duplicate = false;
     }
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -289,6 +289,14 @@ public class BsSuitCase extends BaseBean {
     @Transient
     @ApiParam(value = "出参转换")
     private List<BsParamAdapter> bsOutParamAdapterList;
+
+    @Transient
+    @ApiParam(value = "请求id")
+    private String requestId;
+
+    @Transient
+    @ApiParam(value = "业务id列表")
+    private List<String> busiIdList;
 }
 
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDuplicateRecord.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @author ns
+ * @create 2021/12/5 0005 下午 15:18
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_DUPLICATE_RECORD",indexes = {
+        @Index(name="bs_suit_request_record_suit_record_id_idx",columnList = "SUIT_RECORD_ID"),
+})
+@ApiModel(value = "适配中出现报文重复记录", description = "适配中出先报文重复记录")
+public class BsSuitDuplicateRecord extends BaseBean {
+
+    @Column(name = "SUIT_RECORD_ID")
+    @ApiParam(value = "适配记录id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitRecordId;
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "适配器套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "REQUEST_SOURCE")
+    @ApiParam(value = "请求来源(枚举)")
+    private Integer requestSource;
+
+    // 移动至记录数据表
+    @Column(name = "REQUEST_ORGIN_PARAM")
+    @ApiParam(value = "请求原始参数")
+    private String requestOrginParam;
+
+    @Column(name = "REQUEST_ID")
+    @ApiParam(value = "请求id")
+    private String requestId;
+
+    @Column(name = "BUSI_ID_LIST")
+    @ApiParam(value = "业务id列表")
+    private String busiIdList;
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDuplicateRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDuplicateRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 重复报文记录
+ * @Reference :
+ * @Author : ns
+ * @CreateDate : 2021-12-05 15:13
+ * @Modify:
+ **/
+@Repository
+public interface BsSuitDuplicateRecordRepository extends BaseRepository<BsSuitDuplicateRecord,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -16,6 +16,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * WMS - SAP 中间数据库接口映射关系
@@ -200,5 +201,8 @@ public class WmsInterfaceDataMapper extends BaseBean {
     @ApiParam("分割符号")
     private String splitSign;
 
+    @ApiParam("moveToErpIds")
+    @Transient
+    private List<String> busiIdList;
 
 }