From a3d274916181c53b10192544790c6fbe8a634286 Mon Sep 17 00:00:00 2001 From: nies Date: Sat, 4 Dec 2021 14:01:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?(update)SuitModel=20=E5=A2=9E=E5=8A=A0reque?= =?UTF-8?q?stId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java | 3 +++ .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java index 984bf02..e533b55 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java @@ -42,4 +42,7 @@ public class SuitModel implements Serializable { @ApiParam(value = "适配器参数") private List bsSuitCaseParamList; + @ApiParam(value = "请求id") + private String requestId; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 4dd5f5f..7b227eb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/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; @@ -126,5 +129,6 @@ public class SuitServerModel implements Serializable { this.suitSid= suitModel.getSuitSid(); this.retryRecordId = suitModel.getRetryRecordId(); this.obj = suitModel.getParamXml(); + this.requestId = suitModel.getRequestId(); } } From ccab3f0c0486464010bd8d7d3e4e57105bdabbd2 Mon Sep 17 00:00:00 2001 From: nies Date: Sat, 4 Dec 2021 15:49:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?(update)BsSuitCase=E5=A2=9E=E5=8A=A0request?= =?UTF-8?q?Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 1bd2e4d..542c5d2 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -289,6 +289,10 @@ public class BsSuitCase extends BaseBean { @Transient @ApiParam(value = "出参转换") private List bsOutParamAdapterList; + + @Transient + @ApiParam(value = "请求id") + private String requestId; } From 058a761500d28c049465350fb721b81f313d762f Mon Sep 17 00:00:00 2001 From: nies Date: Sun, 5 Dec 2021 16:21:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?(update)=E5=A2=9E=E5=8A=A0=E9=80=82?= =?UTF-8?q?=E9=85=8D=E9=87=8D=E5=A4=8D=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/softswitch/SuitModel.java | 2 + .../pojo/model/softswitch/SuitServerModel.java | 12 +++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 ++ .../softswitch/bean/BsSuitDuplicateRecord.java | 58 ++++++++++++++++++++++ .../BsSuitDuplicateRecordRepository.java | 16 ++++++ 5 files changed, 92 insertions(+) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDuplicateRecord.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDuplicateRecordRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java index e533b55..53c9a80 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java @@ -45,4 +45,6 @@ public class SuitModel implements Serializable { @ApiParam(value = "请求id") private String requestId; + @ApiParam(value = "业务id列表") + private List busiIdList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 7b227eb..4053ffb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -121,6 +121,16 @@ public class SuitServerModel implements Serializable { // @XStreamImplicit private String analyzeMessage; + /** + * 业务id列表 + */ + private List busiIdList; + + /** + * 适配是否重复 + */ + private Boolean duplicate; + public SuitServerModel(){ } public SuitServerModel(SuitModel suitModel){ @@ -130,5 +140,7 @@ public class SuitServerModel implements Serializable { this.retryRecordId = suitModel.getRetryRecordId(); this.obj = suitModel.getParamXml(); this.requestId = suitModel.getRequestId(); + this.busiIdList = suitModel.getBusiIdList(); + this.duplicate = false; } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 542c5d2..c15f159 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -293,6 +293,10 @@ public class BsSuitCase extends BaseBean { @Transient @ApiParam(value = "请求id") private String requestId; + + @Transient + @ApiParam(value = "业务id列表") + private List busiIdList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDuplicateRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDuplicateRecord.java new file mode 100644 index 0000000..32ee21d --- /dev/null +++ b/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; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDuplicateRecordRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDuplicateRecordRepository.java new file mode 100644 index 0000000..b1e0399 --- /dev/null +++ b/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 { +} From 585e2aefe11344e2e1f8167e58b3978820395c73 Mon Sep 17 00:00:00 2001 From: nies Date: Sun, 5 Dec 2021 17:16:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?(update)WmsInterfaceDataMapper=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0busiIdList=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 825d8c6..bb92ad8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/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 busiIdList; } From f1811b42de69a56646f6701e286c6b5635ea9dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Mon, 6 Dec 2021 10:33:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7(custPartNo)=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java index 4ebc140..df564ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java +++ b/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; } From 4d611095413c4d79ae5f82cdcc1ba0994228a8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Thu, 9 Dec 2021 15:56:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?MesKpsnRule(=E5=85=B3=E9=94=AE=E4=BB=B6?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99),MesBypa?= =?UTF-8?q?ssMapping(MES=5FBYPASS=E9=A1=B9=E6=98=A0=E5=B0=84=E5=85=B3?= =?UTF-8?q?=E7=B3=BB)=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=BB=A3(prodCfg?= =?UTF-8?q?TypeCode)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java index f6d19df..b6ae404 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java +++ b/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; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java index 53b13c1..039369c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java +++ b/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;