From d2ec6e27a598ce2794179a5150559727226d4d0b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 9 Jul 2021 22:17:37 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89=E7=89=88=E6=9C=AC=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, 4 insertions(+), 4 deletions(-) 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 f946878..5831465 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 @@ -211,10 +211,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("包规数量") private Double packageQty; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; @Transient @ApiParam("缺陷代码") From f0c0a4038c3f774923d7ed5724975c761b522670 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 9 Jul 2021 23:22:12 +0800 Subject: [PATCH 02/25] =?UTF-8?q?ua=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 46d5f1e..ac9830d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -6758,4 +6758,37 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPC_TYPE { + + UA(10, "UA"), + DA(20, "DA"); + + private int value; + private String code; + + OPC_TYPE(int value, String code) { + this.value = value; + this.code = code; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + } + } From 09e380d1f2f3d051655e5ac89f7f008eedcf6ab0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 10 Jul 2021 17:08:55 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=80=BC=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 37fc2ec..ff9b3c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -50,6 +50,7 @@ public class WmsPOMaster extends BaseBean { */ @Column(name = "PO_TYPE") @ApiParam("单据类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_TYPE.class, refForeignKey = "value", value = "description") public String poType; /** @@ -89,6 +90,7 @@ public class WmsPOMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生成任务", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; @Column(name = "IS_PART") @@ -121,6 +123,7 @@ public class WmsPOMaster extends BaseBean { @Column(name = "IS_SN") @ApiParam(value = "是否生成条码", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isSn; @Column(name = "CONTAINER_NO") @@ -177,6 +180,7 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("看板状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description") private Integer boardStatus; @Transient From 804401e12c882866afeaec1907e1a6e3e2165a98 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Jul 2021 13:31:43 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index ce8d025..3354e36 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -238,6 +238,11 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } From 52b70927b3a5ac6c55c3fe10a2e3d6511b2312d8 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 16 Jul 2021 12:25:19 +0800 Subject: [PATCH 05/25] =?UTF-8?q?ptl=E4=BA=AE=E7=81=AF=E5=A2=9E=E5=8A=A0ba?= =?UTF-8?q?ckoff=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index cdd6725..8eeef68 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -5,16 +5,10 @@ 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.Version; +import javax.persistence.*; import java.io.Serializable; /** @@ -71,4 +65,7 @@ public class PtlControl extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; + @Column(name = "BACKOFF") + @ApiParam("是否需要回调") + private Integer backoff; } From c93d9bdd2a4434946d4b34d0d9829c00ecea9c59 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Fri, 16 Jul 2021 14:03:13 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3ASN=E7=9C=8B=E6=9D=BF=E6=98=8E=E7=BB=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E5=90=8E=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 1ccf8d2..aed8e5f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -330,7 +330,7 @@ public class WmsPOMasterDetails extends BaseBean { } public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime, - Double snp, Long totalBoxes, Double qty) { + Double snp, Long totalBoxes, Double qty,Double recQty,String modifyDatetime) { this.orderNo = orderNo; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -339,6 +339,8 @@ public class WmsPOMasterDetails extends BaseBean { this.snp = snp; this.totalBoxes = totalBoxes.intValue(); this.qty = qty; + this.rcQty = recQty; + this.modifyDatetime = modifyDatetime; } public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, From fdec525fa1e3728f3cebaef9e17cff0e7529119d Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Sun, 18 Jul 2021 22:35:11 +0800 Subject: [PATCH 07/25] =?UTF-8?q?16788=2019081-=E5=8C=97=E4=BA=AC=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=EF=BC=8CERP=E6=98=8E=E7=BB=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96=EF=BC=8C2021-07-16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java index 14eeefb..0887cf1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpFgDetailsSnapshot.java @@ -64,4 +64,12 @@ public class WmsErpFgDetailsSnapshot extends BaseBean { @ApiParam("存储区") private String zoneNo; + + public WmsErpFgDetailsSnapshot(String snapshotTime,String createDatetime){ + this.snapshotTime = snapshotTime; + this.createDatetime = createDatetime; + } + + public WmsErpFgDetailsSnapshot(){ + } } From 4cd0f48f52d0a8d8a8b29ed90491ded98c716b8c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 19 Jul 2021 16:53:52 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E3=80=90=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 53ed57b..1a810a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -566,6 +566,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 DdlPreparedPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); + //是否字节点 + DdlPreparedPack.getNumEqualPack(wmsZones.getIsSonNode(), "isSonNode", result); getStringBuilderPack(wmsZones, result); From efbb51711e07aea21728f336cda13442baf9df6a Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 22 Jul 2021 11:04:13 +0800 Subject: [PATCH 09/25] =?UTF-8?q?16826=2019081-=E5=A4=87=E4=BB=B6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=80=89=E9=A1=B9=EF=BC=8C=E4=BE=BF=E4=BA=8E?= =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=AF=BC=E5=85=A5-20210723?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java index 5d33515..793838e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -58,4 +58,6 @@ public class SparePartsImportModel { @ApiParam("用量") private Integer qty; + @ApiParam("生成次数") + private Integer time; } From 7945213f6e93774be97299392c44fc07b0697eb8 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Sat, 24 Jul 2021 19:53:44 +0800 Subject: [PATCH 10/25] =?UTF-8?q?19048=20--=20=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E9=80=89=E6=8B=A9ERP=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E3=80=90=E5=B7=B2=E9=80=80?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E3=80=91=E5=AD=97=E6=AE=B5=20--20210710?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index a65a085..41c8480 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -826,4 +826,10 @@ public class WmsDocMovementDetails extends BaseBean { this.createUser = createUser; } + + public WmsDocMovementDetails (String erpSrcNo,String partNo,Double outQty) { + this.erpSrcNo = erpSrcNo; + this.partNo = partNo; + this.outQty = outQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index aed8e5f..006abbd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -249,6 +249,10 @@ public class WmsPOMasterDetails extends BaseBean { private Double sumRcQty; @Transient + @ApiParam("退货数量") + private Double outQty; + + @Transient @ApiParam("单据集合") private List orderNoLst; From add0708fb28a90815b9569caef74740749820f29 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 26 Jul 2021 16:07:30 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E3=80=903617=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E5=90=8E=E7=AB=AF=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 6060bdd..56c453d 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 @@ -1025,11 +1025,22 @@ public class WmsStockSn extends BaseBean { this.vendorNo = vendorNo; } - - - public WmsStockSn(String partNo, Double qty) { this.partNo = partNo; this.qty = qty; } + + public WmsStockSn(WmsStockSn wmsStockSn, String modifyDatetime ,String modifyUser) { + this.sn = wmsStockSn.getSn(); + this.partNo = wmsStockSn.getPartNo(); + this.partNameRdd = wmsStockSn.getPartNameRdd(); + this.qty = wmsStockSn.getQty(); + this.vendorNo = wmsStockSn.getVendorNo(); + this.lotNo = wmsStockSn.getLotNo(); + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + this.leftCode = wmsStockSn.getLeftCode(); + this.dateCode = wmsStockSn.getDateCode(); + this.fixLotNo = wmsStockSn.getFixLotNo(); + } } From 1e0f9a847a5dfe1355409804d571a4dc887f064d Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 27 Jul 2021 15:38:48 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84model=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/UserInfoImportModel.java | 163 +++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java new file mode 100644 index 0000000..debc6fc --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java @@ -0,0 +1,163 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; + +/** + * @author ns + * @create 2021/7/21 0021 上午 10:20 + */ +@Data +@ApiModel +public class UserInfoImportModel extends BaseBean { + private static final long serialVersionUID = -6597413958814715617L; + + @ApiModelProperty(value = "姓名", access = "名称") + @AnnoOutputColumn() + private String infoName; + + @ApiModelProperty(value = "工号") + @AnnoOutputColumn() + private String infoEmpNo; + + + @ApiModelProperty(value = "员工类型", access = "实习、试用期、正式") + @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE) + private Integer infoEmployeeType; + + @ApiModelProperty(value = "员工等级") + @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE) + private Integer infoGrade; + + @ApiModelProperty(value = "性别（1.男，2.女）", example = "1", access = "性别（1.男，2.女）") + @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_SEX) + private Integer infoSex; + + @ApiModelProperty(value = "婚姻", example = "1", access = "性别（1.未知，2.已婚,3未婚）") + @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE) + private Integer infoMarriage; + + + @ApiModelProperty(value = "证件类型") + @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE) + private Integer infoCardType; + + @ApiModelProperty(value = "证件编号") + private String infoCardNumber; + + @ApiModelProperty(value = "毕业专业") + private String infoSchoolProfession; + + @ApiModelProperty(value = "毕业院校") + private String infoSchool; + + @ApiModelProperty(value = "学历") + @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EDUCATION) + private Integer infoSchoolEducation; + + + @ApiModelProperty(value = "毕业时间") + private String infoSchoolLeaveDate; + + + @ApiModelProperty(value = "籍贯") + private String infoBirthplace; + + @ApiModelProperty(value = "种族") + @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY) + private Integer infoRace; + + + @ApiModelProperty(value = "紧急联系人") + private String userEmergencyContact; + + @ApiModelProperty(value = "紧急联系人-电话") + private String userEmergencyPhone; + + + @ApiModelProperty(value = "紧急联系人") + private String infoEmergencyContact; + + @ApiModelProperty(value = "紧急联系人-电话") + private String infoEmergencyPhone; + + @ApiModelProperty(value = "入职日期", access = "默认当前时间") + private String infoJoinDate; + + @ApiModelProperty(value = "离职日期", access = "默认当前时间") + private String infoResignationDate; + + @ApiModelProperty(value = "政治面貌") + @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS) + private Integer infoPoliticalStatus; + + @ApiModelProperty(value = "出生日期") + private String infoBornDate; + + @ApiModelProperty(value = "部门名称", access = "部门名称") + private String infoDepartmentNameRdds; + + @ApiModelProperty(value = "岗位", access = "岗位") + private String positionNameRdds; + + @ApiModelProperty(value = "主部门", access = "主部门") + private String infoDepartmentNameRdd; + + @ApiModelProperty(value = "主岗位", access = "主岗位") + private String positionNameRdd; + + @ApiModelProperty(value = "家庭地址") + private String infoFamilyAddress; + + @ApiModelProperty(value = "兴趣爱好") + private String infoHobby; + + /********************************** 账号相关 ********************************/ + + @ApiModelProperty(value = "登陆名称", access = "登陆名称") + @AnnoOutputColumn + private String userLoginName; + + @ApiModelProperty(value = "用户语言") + private String languageCode; + + @ApiParam(value = "登陆密码") + @AnnoOutputColumn + private String userLoginPassword; + + + @ApiModelProperty(value = "角色名称", access = "角色名称") + @AnnoOutputColumn + private String roleNameRdds; + + @ApiModelProperty(value = "手机号", access = "手机号") + private String userPhone; + + @ApiModelProperty(value = "操作部门", access = "操作部门部门") + @AnnoOutputColumn + private String userDepartmentNameRdds; + + @ApiModelProperty(value = "主操作部门", access = "主操作部门") + @AnnoOutputColumn + private String userDepartmentNameRdd; + + @ApiModelProperty(value = "邮箱", access = "邮箱") + private String userEmail; + + @ApiModelProperty(value = "微信号") + private String userWeChatNo; + + @ApiModelProperty(value = "组织名称", access = "组织名称") + private String organizeNameRdd; + + +} From 0a36e83fd55be9c8dae210f0dabee7ab1b7bbd31 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 29 Jul 2021 15:45:54 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/UserInfoImportModel.java | 57 ++++++++++------------ 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java index debc6fc..e72c927 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java @@ -17,8 +17,8 @@ import javax.persistence.Column; * @create 2021/7/21 0021 上午 10:20 */ @Data -@ApiModel -public class UserInfoImportModel extends BaseBean { +@ApiModel(value = "userImportTemplate") +public class UserInfoImportModel { private static final long serialVersionUID = -6597413958814715617L; @ApiModelProperty(value = "姓名", access = "名称") @@ -29,26 +29,24 @@ public class UserInfoImportModel extends BaseBean { @AnnoOutputColumn() private String infoEmpNo; - @ApiModelProperty(value = "员工类型", access = "实习、试用期、正式") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE) + @AnnoOutputColumn(required = false, name = "员工类型", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_TYPE) private Integer infoEmployeeType; @ApiModelProperty(value = "员工等级") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE) + @AnnoOutputColumn(required = false, name = "员工等级", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EMPLOYEE_GRADE) private Integer infoGrade; - @ApiModelProperty(value = "性别（1.男，2.女）", example = "1", access = "性别（1.男，2.女）") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_SEX) + @ApiModelProperty(value = "性别", example = "1", access = "性别（1.男，2.女）") + @AnnoOutputColumn(required = false,name = "性别", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_SEX) private Integer infoSex; @ApiModelProperty(value = "婚姻", example = "1", access = "性别（1.未知，2.已婚,3未婚）") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE) + @AnnoOutputColumn(required = false, name = "婚姻",refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_MARRIAGE) private Integer infoMarriage; - @ApiModelProperty(value = "证件类型") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE) + @AnnoOutputColumn(required = false, name = "证件类型", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_CERTIFICATE_TYPE) private Integer infoCardType; @ApiModelProperty(value = "证件编号") @@ -61,27 +59,25 @@ public class UserInfoImportModel extends BaseBean { private String infoSchool; @ApiModelProperty(value = "学历") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EDUCATION) + @AnnoOutputColumn(required = false,name = "学历", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_EDUCATION) private Integer infoSchoolEducation; - @ApiModelProperty(value = "毕业时间") private String infoSchoolLeaveDate; - @ApiModelProperty(value = "籍贯") private String infoBirthplace; @ApiModelProperty(value = "种族") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY) + @AnnoOutputColumn(required = false,name = "种族", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_NATIONALITY) private Integer infoRace; - @ApiModelProperty(value = "紧急联系人") - private String userEmergencyContact; - - @ApiModelProperty(value = "紧急联系人-电话") - private String userEmergencyPhone; +// @ApiModelProperty(value = "紧急联系人") +// private String userEmergencyContact; +// +// @ApiModelProperty(value = "紧急联系人-电话") +// private String userEmergencyPhone; @ApiModelProperty(value = "紧急联系人") @@ -90,28 +86,28 @@ public class UserInfoImportModel extends BaseBean { @ApiModelProperty(value = "紧急联系人-电话") private String infoEmergencyPhone; - @ApiModelProperty(value = "入职日期", access = "默认当前时间") + @ApiModelProperty(value = "入职日期") private String infoJoinDate; - @ApiModelProperty(value = "离职日期", access = "默认当前时间") + @ApiModelProperty(value = "离职日期") private String infoResignationDate; @ApiModelProperty(value = "政治面貌") - @AnnoOutputColumn(required = false, refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS) + @AnnoOutputColumn(required = false, name = "政治面貌", refClass = SysDictionary.class, value = "name", refForeignKey = BaseConstWords.DICTIONARY_POLITICAL_STATUS) private Integer infoPoliticalStatus; @ApiModelProperty(value = "出生日期") private String infoBornDate; - @ApiModelProperty(value = "部门名称", access = "部门名称") + @ApiModelProperty(value = "部门", access = "部门") private String infoDepartmentNameRdds; - @ApiModelProperty(value = "岗位", access = "岗位") - private String positionNameRdds; - @ApiModelProperty(value = "主部门", access = "主部门") private String infoDepartmentNameRdd; + @ApiModelProperty(value = "岗位", access = "岗位") + private String positionNameRdds; + @ApiModelProperty(value = "主岗位", access = "主岗位") private String positionNameRdd; @@ -130,9 +126,9 @@ public class UserInfoImportModel extends BaseBean { @ApiModelProperty(value = "用户语言") private String languageCode; - @ApiParam(value = "登陆密码") - @AnnoOutputColumn - private String userLoginPassword; +// @ApiParam(value = "登陆密码") +// @AnnoOutputColumn +// private String userLoginPassword; @ApiModelProperty(value = "角色名称", access = "角色名称") @@ -156,8 +152,5 @@ public class UserInfoImportModel extends BaseBean { @ApiModelProperty(value = "微信号") private String userWeChatNo; - @ApiModelProperty(value = "组织名称", access = "组织名称") - private String organizeNameRdd; - } From 51160a45866c9e0aa15f3fe59bc738f6196581c6 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 29 Jul 2021 17:49:15 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java index e72c927..3a81030 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserInfoImportModel.java @@ -100,15 +100,19 @@ public class UserInfoImportModel { private String infoBornDate; @ApiModelProperty(value = "部门", access = "部门") + @AnnoOutputColumn private String infoDepartmentNameRdds; @ApiModelProperty(value = "主部门", access = "主部门") + @AnnoOutputColumn private String infoDepartmentNameRdd; @ApiModelProperty(value = "岗位", access = "岗位") + @AnnoOutputColumn private String positionNameRdds; @ApiModelProperty(value = "主岗位", access = "主岗位") + @AnnoOutputColumn private String positionNameRdd; @ApiModelProperty(value = "家庭地址") From f4e6c63956e679f1f60c953e143770cc9d496e1c Mon Sep 17 00:00:00 2001 From: jhh2579 <2579728558@qq.com> Date: Fri, 30 Jul 2021 17:56:35 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java | 87 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java | 124 +++++++++++++++++++++ 4 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index d513d0d..5d6120a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2775,7 +2775,8 @@ public class MesEnumUtil { FIRST_CHECK(10, "FIRST_CHECK", "首检"), ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), END_CHECK(30, "END_CHECK", "末检"), - RC_CHECK(40, "RC_CHECK", "发货检验"); + RC_CHECK(40, "RC_CHECK", "发货检验"), + OUTSOURCE_CHECK(50, "工序外协检"); private int value; private String code; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index ac9830d..ca147d9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1030,7 +1030,8 @@ public class MesPcnEnumUtil { FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), END_CHECK(30, "末检"), - RC_CHECK(40, "发货检验"); + RC_CHECK(40, "发货检验"), + OUTSOURCE_CHECK(50, "工序外协检"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java new file mode 100644 index 0000000..81e4e4b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +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.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : honghui.jiang + * @CreateDate : 2021-07-28 18:53 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "QMS_WMS_INQC") +@Api("同步质检表") +public class QmsWmsInqc extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2821213670812244228L; + @Column(name = "RUID") + @ApiParam("RUID") + private Integer ruid; + + @Column(name = "UUID") + @ApiParam("收获流水号") + private Integer uuid; + + @Column(name = "MATNR") + @ApiParam("物料编码") + private String matnr; + + @Column(name = "ZDEV") + @ApiParam("是否合格") + private String zdev; + + @Column(name = "ZPOST") + @ApiParam("交易日期") + private String zPost; + + @Column(name = "ZTIME") + @ApiParam("交易时间") + private String zTime; + + @Column(name = "ADD_TIME_YMD") + @ApiParam("添加日期") + private String addTimeYmd; + + @Column(name = "ADDTIME_HMS") + @ApiParam("添加时间") + private String addTimeHms; + + @Column(name = "FINISHTIME_YMD") + @ApiParam("处理日期") + private String finishTimeYmd; + + @Column(name = "FINISHTIME_HMS") + @ApiParam("处理时间") + private String finishTimeHms; + + @Column(name = "DELETE_FLAG") + @ApiParam("删除标记") + private Integer deleteFlag; + + @Column(name = "READ_FLAG") + @ApiParam("读取标识") + private Integer readFlag; + + @Column(name = "ERR_CODE") + @ApiParam("错误代") + private String errCode; + + @Column(name = "ERR_MSG") + @ApiParam("错误信息") + private String errMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java new file mode 100644 index 0000000..0a68afe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java @@ -0,0 +1,124 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +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.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2021-07-28 18:32 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "WMS_QMS_IB") +@Api("工序外协接口表") +public class WmsQmsIb extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1543736169792837863L; + @Column(name = "RUID") + @ApiParam("RUID") + private Integer ruid; + + @Column(name = "UUID") + @ApiParam("收获流水号") + private Integer uuid; + + @Column(name = "WERKS") + @ApiParam("域") + private String werks; + + @Column(name = "LGORT") + @ApiParam("地点") + private String lgort; + + @Column(name = "WLBRT") + @ApiParam("收获库位") + private String wlbrt; + + @Column(name = "REFID") + @ApiParam("单据号") + private String refId; + + @Column(name = "ZEILE") + @ApiParam("行号") + private Integer zeile; + + @Column(name = "ACTION") + @ApiParam("业务类型") + private String action; + + @Column(name = "LIFNR") + @ApiParam("供应商编码") + private String lifnr; + + @Column(name = "MATNR") + @ApiParam("物料编码") + private String matnr; + + @Column(name = "ERFMG") + @ApiParam("收获数量") + private Integer erfmg; + + @Column(name = "ERFME") + @ApiParam("计量单位") + private String erfme; + + @Column(name = "CHKNO") + @ApiParam("检验编号") + private String chkno; + + @Column(name = "STONO") + @ApiParam("炉批号") + private String stono; + + @Column(name = "ZPOST") + @ApiParam("收获日期") + private String zpost; + + @Column(name = "ZTIME") + @ApiParam("收获时间") + private String ztime; + + @Column(name = "ADDTIME_YMD") + @ApiParam("添加日期") + private String addtimeYmd; + + @Column(name = "ADDTIME_HMS") + @ApiParam("添加时间") + private String addtimeHms; + + @Column(name = "FINISHTIME_YMD") + @ApiParam("处理日期") + private String finishtimeYmd; + + @Column(name = "FINISHTIME_HMS") + @ApiParam("处理时间") + private String finishtimeHms; + + @Column(name = "DELETE_FLAG") + @ApiParam("删除标记") + private Integer deleteFlag; + + @Column(name = "READ_FLAG") + @ApiParam("读取标识") + private Integer readFlag; + + @Column(name = "ERR_CODE") + @ApiParam("错误代") + private String errCode; + +} From 9dac40797a36e1536e4837b32d9fd8f30c4f1b85 Mon Sep 17 00:00:00 2001 From: jhh2579 <2579728558@qq.com> Date: Fri, 30 Jul 2021 18:15:22 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=A3=80-2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java index 81e4e4b..b041e74 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java @@ -24,7 +24,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "QMS_WMS_INQC") +@Table(name = "IF_QMS_WMS_INQC") @Api("同步质检表") public class QmsWmsInqc extends BaseBean implements Serializable { From 54279d43ffcbecd3dcdb707fd60968ccf50db04a Mon Sep 17 00:00:00 2001 From: jhh2579 <2579728558@qq.com> Date: Fri, 30 Jul 2021 18:20:30 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java | 87 --------------- .../cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java | 124 --------------------- 2 files changed, 211 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java deleted file mode 100644 index b041e74..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/QmsWmsInqc.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -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.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : honghui.jiang - * @CreateDate : 2021-07-28 18:53 - * @Modify: - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_QMS_WMS_INQC") -@Api("同步质检表") -public class QmsWmsInqc extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2821213670812244228L; - @Column(name = "RUID") - @ApiParam("RUID") - private Integer ruid; - - @Column(name = "UUID") - @ApiParam("收获流水号") - private Integer uuid; - - @Column(name = "MATNR") - @ApiParam("物料编码") - private String matnr; - - @Column(name = "ZDEV") - @ApiParam("是否合格") - private String zdev; - - @Column(name = "ZPOST") - @ApiParam("交易日期") - private String zPost; - - @Column(name = "ZTIME") - @ApiParam("交易时间") - private String zTime; - - @Column(name = "ADD_TIME_YMD") - @ApiParam("添加日期") - private String addTimeYmd; - - @Column(name = "ADDTIME_HMS") - @ApiParam("添加时间") - private String addTimeHms; - - @Column(name = "FINISHTIME_YMD") - @ApiParam("处理日期") - private String finishTimeYmd; - - @Column(name = "FINISHTIME_HMS") - @ApiParam("处理时间") - private String finishTimeHms; - - @Column(name = "DELETE_FLAG") - @ApiParam("删除标记") - private Integer deleteFlag; - - @Column(name = "READ_FLAG") - @ApiParam("读取标识") - private Integer readFlag; - - @Column(name = "ERR_CODE") - @ApiParam("错误代") - private String errCode; - - @Column(name = "ERR_MSG") - @ApiParam("错误信息") - private String errMsg; -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java deleted file mode 100644 index 0a68afe..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/WmsQmsIb.java +++ /dev/null @@ -1,124 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -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.io.Serializable; - -/** - * @Description : - * @Reference : - * @Author : - * @CreateDate : 2021-07-28 18:32 - * @Modify: - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "WMS_QMS_IB") -@Api("工序外协接口表") -public class WmsQmsIb extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1543736169792837863L; - @Column(name = "RUID") - @ApiParam("RUID") - private Integer ruid; - - @Column(name = "UUID") - @ApiParam("收获流水号") - private Integer uuid; - - @Column(name = "WERKS") - @ApiParam("域") - private String werks; - - @Column(name = "LGORT") - @ApiParam("地点") - private String lgort; - - @Column(name = "WLBRT") - @ApiParam("收获库位") - private String wlbrt; - - @Column(name = "REFID") - @ApiParam("单据号") - private String refId; - - @Column(name = "ZEILE") - @ApiParam("行号") - private Integer zeile; - - @Column(name = "ACTION") - @ApiParam("业务类型") - private String action; - - @Column(name = "LIFNR") - @ApiParam("供应商编码") - private String lifnr; - - @Column(name = "MATNR") - @ApiParam("物料编码") - private String matnr; - - @Column(name = "ERFMG") - @ApiParam("收获数量") - private Integer erfmg; - - @Column(name = "ERFME") - @ApiParam("计量单位") - private String erfme; - - @Column(name = "CHKNO") - @ApiParam("检验编号") - private String chkno; - - @Column(name = "STONO") - @ApiParam("炉批号") - private String stono; - - @Column(name = "ZPOST") - @ApiParam("收获日期") - private String zpost; - - @Column(name = "ZTIME") - @ApiParam("收获时间") - private String ztime; - - @Column(name = "ADDTIME_YMD") - @ApiParam("添加日期") - private String addtimeYmd; - - @Column(name = "ADDTIME_HMS") - @ApiParam("添加时间") - private String addtimeHms; - - @Column(name = "FINISHTIME_YMD") - @ApiParam("处理日期") - private String finishtimeYmd; - - @Column(name = "FINISHTIME_HMS") - @ApiParam("处理时间") - private String finishtimeHms; - - @Column(name = "DELETE_FLAG") - @ApiParam("删除标记") - private Integer deleteFlag; - - @Column(name = "READ_FLAG") - @ApiParam("读取标识") - private Integer readFlag; - - @Column(name = "ERR_CODE") - @ApiParam("错误代") - private String errCode; - -} From d0c62b9b2d7b82c01ef5f5c453f06a729489a7ce Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Sun, 1 Aug 2021 09:42:26 +0800 Subject: [PATCH 18/25] =?UTF-8?q?16909=2019081-=E7=94=9F=E4=BA=A7=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=8D=95=E5=AF=BC=E5=85=A5XLS=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=98=AF=E3=80=90=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E6=8A=A5=E5=BA=9F=E3=80=91=EF=BC=8C=E8=80=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=AD=A3=E5=B8=B8=E7=9A=84=E3=80=90=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 3354e36..b55bde9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -9594,6 +9594,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCRAP_TYPE { + NORMAL_SCRAP(0, "NORMAL", "生产报废"), ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"), AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废"); From 4850f4ccc2adebd7580e32fe14c40163644c5536 Mon Sep 17 00:00:00 2001 From: nies Date: Sun, 1 Aug 2021 14:11:50 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E6=96=B0=E5=A2=9Etms=E7=9A=84SOFT=5FTYPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index a8f259c..fcbfc0a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -26,6 +26,7 @@ public class CommonEnumUtil { WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"), SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"), QMS(5, 0, 0, 0, "i3qms", "质量管理软件"), + TMS(101, 8250, 24, 118000000L, "i3tms", "运输管理系统"), /** * Mes 服务 From 3bfb61178bb3082b26281ab46448d3fc0b439002 Mon Sep 17 00:00:00 2001 From: nies Date: Sun, 1 Aug 2021 14:36:22 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9MES=5FQC=5FCHECK=5FTYPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 5d6120a..dbb1e2e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2776,7 +2776,7 @@ public class MesEnumUtil { ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), END_CHECK(30, "END_CHECK", "末检"), RC_CHECK(40, "RC_CHECK", "发货检验"), - OUTSOURCE_CHECK(50, "工序外协检"); + OUTSOURCE_CHECK(50, "OUTSOURCE_CHECK","工序外协检"); private int value; private String code; From 20029216eae8b8d12a2675cc44631c7cba5cadb8 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Mon, 2 Aug 2021 10:16:43 +0800 Subject: [PATCH 21/25] =?UTF-8?q?16919=2019081-=E7=94=9F=E4=BA=A7=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=8D=95=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 41c8480..8e8e88e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -424,6 +424,10 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description") public Integer scrapType; + @Transient + @ApiParam("报废类型名字") + public String scrapTypeName; + public String getRecommondLot() { From 84f686b54e18f319cff52f4c3631c668440e0dad Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Mon, 2 Aug 2021 16:19:15 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E5=8D=8E=E5=9F=9F=E9=9B=B6=E6=98=9F?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E5=8C=85=E8=A3=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=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/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 8e8e88e..7b460fa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -158,6 +158,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("维修名称") private String repairName; + @Column(name = "SPEC_CODE") + @ApiParam("包装代码") + private String specCode; + @Transient @ApiParam(value = "完成状态") public Integer orderStatus; From 5a44baf73aa737b27956ad6b06df0f386a19db0e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 2 Aug 2021 20:31:33 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 02668f4..b95e375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,9 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Transient; - /** * @Description: 打印条码工步， 打印信息模板 * @Reference: @@ -159,4 +156,6 @@ public class StepPrintSnModel extends MesProduceSn { private String qcCode; @ApiParam("打印机名称") private String printerName; + @ApiParam("是否DB件") + private String isDb; } From 472504f4a8432f3775f7558085113df4fcf4ef2b Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Tue, 3 Aug 2021 18:18:51 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=8D=8E=E5=9F=9F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 7b460fa..8e8e88e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -158,10 +158,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("维修名称") private String repairName; - @Column(name = "SPEC_CODE") - @ApiParam("包装代码") - private String specCode; - @Transient @ApiParam(value = "完成状态") public Integer orderStatus; From 91bd3d9021cdab7c064377cd1f1c597095804242 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 3 Aug 2021 20:05:46 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index b95e375..68c3855 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -158,4 +158,6 @@ public class StepPrintSnModel extends MesProduceSn { private String printerName; @ApiParam("是否DB件") private String isDb; + @ApiParam("图片url") + private String imageUrl; }