From a43b17841ff8e3373eb4625e9a7ccd168fa34055 Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 24 Dec 2021 11:47:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=96=B0?= =?UTF-8?q?=E5=A2=9ESuitRetryModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- .../pojo/model/softswitch/SuitRetryModel.java | 24 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 8 ++++++++ .../pojo/softswitch/bean/BsSuitCaseType.java | 5 ++++- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index e7c518c..f14ae37 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -236,7 +236,8 @@ public class BlockSoftSwitchEnumUtil { REST(6,"REST调用"), WEB_SERVICE(7,"WebService"), SOCKET(8,"socket"), - RETRY(9,"重试"); + RETRY(9,"重试"), + TEST(10,"手动测试"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java new file mode 100644 index 0000000..48ea646 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @author ns + * @create 2021/12/22 0022 下午 13:39 + */ +@Data +@ApiModel("重试类型model") +public class SuitRetryModel { + @ApiParam(value = "适配器代码") + private String suitCaseCode; + + @ApiParam(value = "适配记录id") + private Long bsSuitRecordId; + + @ApiParam(value = "适配器") + private BsSuitCase bsSuitCase; +} 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 c15f159..6e56daa 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 @@ -266,6 +266,14 @@ public class BsSuitCase extends BaseBean { return retryInterval == null ? 10: retryInterval; } + @Column(name = "RETRY_TIME") + @ApiParam(value = "重试次数（s）") + private Integer retryTime; + + public int getRetryTimeVal() { + return (retryTime == null || retryTime < 0) ? 1 : retryTime; + } + @Transient @ApiParam(value = "适配器套件明细") private Object bsSuitCaseDetail; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java index ce0efa9..ac42c49 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java @@ -34,7 +34,7 @@ public class BsSuitCaseType extends BaseBean { @Column(name = "SUIT_CASE_TYPE_ID") @ApiParam(value = "适配器类型id") @JsonSerialize(using = ToStringSerializer.class) - private Long suitCaseTypeId; + private Integer suitCaseTypeId; @Column(name = "SUIT_CASE_TYPE_NAME") @ApiParam(value = "适配器类型名称") @@ -48,6 +48,9 @@ public class BsSuitCaseType extends BaseBean { @ApiParam(value = "适配器适配失败报警邮箱") private String suitCaseTypeAlarmEmail; + @Column(name = "ENABLE_ALARM_EMAIL") + @ApiParam(value = "是否开启适配报警邮箱发送") + private Integer enableAlarmEmail; } From da44d62f8fff9e06214671b87786d5d04ffee271 Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Wed, 29 Dec 2021 17:41:37 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=A1=A5=E5=81=BF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index b9ec8a9..e5c2576 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -159,6 +159,14 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("Vin") private String vinCode; + @Column(name = "IF_COMPENSATE") + @ApiParam(value ="是否补偿") + private Integer ifCompensate; + + @Column(name = "COMPENSATE_TIME") + @ApiParam(value ="补偿时间") + private String compensateTime; + @Transient @ApiParam("返回信息") private String resultMsg; From 6a07e7ff3055a5b3a20174f9e3831b9d0f21de99 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 30 Dec 2021 19:29:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index 4641032..037b8ba 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -116,6 +116,11 @@ public class BasVendor extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; + @Column(name = "FIRST_LOGIN") + @ApiParam("是否首次登录") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer firstLogin; + public BasVendor() { } @@ -123,4 +128,4 @@ public class BasVendor extends BaseBean{ this.id = id; this.userName = userName; } -} \ No newline at end of file +} From d5f6d501b56b8b040fb9d38f95221d08a36403f8 Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 31 Dec 2021 10:26:09 +0800 Subject: [PATCH 4/6] =?UTF-8?q?WmsStockSn=E6=96=B0=E5=A2=9E=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 7cc1a9a..c47f613 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -1100,4 +1100,72 @@ public class WmsStockSn extends BaseBean { this.dateCode = wmsStockSn.getDateCode(); this.fixLotNo = wmsStockSn.getFixLotNo(); } + + /** + * 条码待打印列表 + * queueGroupNo + * remark + */ + public WmsStockSn(String organizeCode, Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo, + String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, + String qualityDate, String custNo, String custSn, String sn2d, + String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser, + String parentPositionNo, Date pdate, Integer printed, String refSrc, String refType, + String shippingFlag, String workCenterCode, Integer snType, + String packagePartNo, Integer useCount, Integer seqNo, + String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, + String prodCfgTypeName, String custNameRdd, String workOrderCode, String color, + String orderNo ,String queueGroupNo, String remark) { + this.organizeCode = organizeCode; + this.id = id; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.vendorNameRdd = vendorNameRdd; + this.qualityDate = qualityDate; + this.custNo = custNo; + this.custSn = custSn; + this.sn2d = sn2d; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + this.parentPositionNo = parentPositionNo; + this.pdate = pdate; + this.printed = printed; + this.refSrc = refSrc; + this.refType = refType; + this.shippingFlag = shippingFlag; + this.workCenterCode = workCenterCode; + this.snType = snType; + this.packagePartNo = packagePartNo; + this.useCount = useCount; + this.seqNo = seqNo; + + this.whNameRdd = whNameRdd; + this.locateNameRdd = locateNameRdd; + this.zoneNameRdd = zoneNameRdd; + this.partTypeDesc = partTypeDesc; + this.prodCfgTypeName = prodCfgTypeName; + this.custNameRdd = custNameRdd; + this.workOrderCode = workOrderCode; + this.color = color; + this.orderNo = orderNo; + this.queueGroupNo = queueGroupNo; + this.remark = remark; + } } From 74f9e00f5661b3e30647e073a1eb6a6462d57bbf Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Fri, 31 Dec 2021 15:24:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E5=81=BF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index e5c2576..1711a9b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -161,7 +161,7 @@ public class MesProduceSn extends BaseBean implements Serializable { @Column(name = "IF_COMPENSATE") @ApiParam(value ="是否补偿") - private Integer ifCompensate; + private Integer ifCompensate = 0; @Column(name = "COMPENSATE_TIME") @ApiParam(value ="补偿时间") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 73f6281..f8e5ed0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -161,6 +161,11 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("员工编号") private String employeeNumber; + @Column(name = "COMPENSATE_SN") + @ApiParam("补偿过程条码") + private String compensateSn; + + @Transient @ApiParam("返回信息") private String resultMsg; From f44a69a46c118b7e75c076dc3df4b288fd02f983 Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 31 Dec 2021 22:13:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?UserDeatilModel=E5=A2=9E=E5=8A=A0=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=AC=A1=E6=95=B0=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/model/platform/UserDetailModel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 6f69f3d..5054632 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -160,6 +160,9 @@ public class UserDetailModel extends BaseBean { @ApiParam(value ="用户ID集合信息") private List userInfoIdList; + @ApiParam(value ="登录次数") + private Integer userLoginNum; + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); @@ -172,6 +175,7 @@ public class UserDetailModel extends BaseBean { user.setUserLoginPassword(this.userLoginPassword); user.setLanguageCode(this.userLanguageCode); user.setOrganizeCode(this.organizeCode); + user.setUserLoginNum(this.userLoginNum); return user; } @@ -206,6 +210,7 @@ public class UserDetailModel extends BaseBean { info.setUserGrade(this.infoGrade); info.setUserEmployeeType(this.infoEmployeeType); info.setOrganizeCode(this.organizeCode); + info.setUserLoginNum(this.userLoginNum); return info; }